Merge "Remove __RENAME_LDBL." am: 87e170df01 am: e6351fb5f0

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2619230

Change-Id: Ie0aec82a0a2ecf7d2d22cae649b347a9c1311d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2023-06-09 15:03:45 +00:00 committed by Automerger Merge Worker
commit 8db2935824
13 changed files with 479 additions and 527 deletions

View file

@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
#define __BIONIC_LP32_USE_LONG_DOUBLE
#include <float.h>
#include <stdlib.h>

View file

@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
#define __BIONIC_LP32_USE_LONG_DOUBLE
#include <wchar.h>
#include <stdlib.h>

View file

@ -55,99 +55,99 @@ __BEGIN_DECLS
/* 7.3.5.1 The cacos functions */
double complex cacos(double complex __z) __INTRODUCED_IN(23);
float complex cacosf(float complex __z) __INTRODUCED_IN(23);
long double complex cacosl(long double complex __z) __RENAME_LDBL(cacos, 23, 26);
long double complex cacosl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.5.2 The casin functions */
double complex casin(double complex __z) __INTRODUCED_IN(23);
float complex casinf(float complex __z) __INTRODUCED_IN(23);
long double complex casinl(long double complex __z) __RENAME_LDBL(casin, 23, 26);
long double complex casinl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.5.1 The catan functions */
double complex catan(double complex __z) __INTRODUCED_IN(23);
float complex catanf(float complex __z) __INTRODUCED_IN(23);
long double complex catanl(long double complex __z) __RENAME_LDBL(catan, 23, 26);
long double complex catanl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.5.1 The ccos functions */
double complex ccos(double complex __z) __INTRODUCED_IN(23);
float complex ccosf(float complex __z) __INTRODUCED_IN(23);
long double complex ccosl(long double complex __z) __RENAME_LDBL(ccos, 23, 26);
long double complex ccosl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.5.1 The csin functions */
double complex csin(double complex __z) __INTRODUCED_IN(23);
float complex csinf(float complex __z) __INTRODUCED_IN(23);
long double complex csinl(long double complex __z) __RENAME_LDBL(csin, 23, 26);
long double complex csinl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.5.1 The ctan functions */
double complex ctan(double complex __z) __INTRODUCED_IN(23);
float complex ctanf(float complex __z) __INTRODUCED_IN(23);
long double complex ctanl(long double complex __z) __RENAME_LDBL(ctan, 23, 26);
long double complex ctanl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.6 Hyperbolic functions */
/* 7.3.6.1 The cacosh functions */
double complex cacosh(double complex __z) __INTRODUCED_IN(23);
float complex cacoshf(float complex __z) __INTRODUCED_IN(23);
long double complex cacoshl(long double complex __z) __RENAME_LDBL(cacosh, 23, 26);
long double complex cacoshl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.6.2 The casinh functions */
double complex casinh(double complex __z) __INTRODUCED_IN(23);
float complex casinhf(float complex __z) __INTRODUCED_IN(23);
long double complex casinhl(long double complex __z) __RENAME_LDBL(casinh, 23, 26);
long double complex casinhl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.6.3 The catanh functions */
double complex catanh(double complex __z) __INTRODUCED_IN(23);
float complex catanhf(float complex __z) __INTRODUCED_IN(23);
long double complex catanhl(long double complex __z) __RENAME_LDBL(catanh, 23, 26);
long double complex catanhl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.6.4 The ccosh functions */
double complex ccosh(double complex __z) __INTRODUCED_IN(23);
float complex ccoshf(float complex __z) __INTRODUCED_IN(23);
long double complex ccoshl(long double complex __z) __RENAME_LDBL(ccosh, 23, 26);
long double complex ccoshl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.6.5 The csinh functions */
double complex csinh(double complex __z) __INTRODUCED_IN(23);
float complex csinhf(float complex __z) __INTRODUCED_IN(23);
long double complex csinhl(long double complex __z) __RENAME_LDBL(csinh, 23, 26);
long double complex csinhl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.6.6 The ctanh functions */
double complex ctanh(double complex __z) __INTRODUCED_IN(23);
float complex ctanhf(float complex __z) __INTRODUCED_IN(23);
long double complex ctanhl(long double complex __z) __RENAME_LDBL(ctanh, 23, 26);
long double complex ctanhl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.7 Exponential and logarithmic functions */
/* 7.3.7.1 The cexp functions */
double complex cexp(double complex __z) __INTRODUCED_IN(23);
float complex cexpf(float complex __z) __INTRODUCED_IN(23);
long double complex cexpl(long double complex __z) __RENAME_LDBL(cexp, 23, 26);
long double complex cexpl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.7.2 The clog functions */
double complex clog(double complex __z) __INTRODUCED_IN(26);
float complex clogf(float complex __z) __INTRODUCED_IN(26);
long double complex clogl(long double complex __z) __RENAME_LDBL(clog, 26, 26);
long double complex clogl(long double complex __z) __INTRODUCED_IN(26);
/* 7.3.8 Power and absolute-value functions */
/* 7.3.8.1 The cabs functions */
double cabs(double complex __z) __INTRODUCED_IN(23);
float cabsf(float complex __z) __INTRODUCED_IN(23);
long double cabsl(long double complex __z) __INTRODUCED_IN_32(21) __INTRODUCED_IN_64(23) /*__RENAME_LDBL(cabs)*/;
long double cabsl(long double complex __z) __INTRODUCED_IN_32(21) __INTRODUCED_IN_64(23);
/* 7.3.8.2 The cpow functions */
double complex cpow(double complex __x, double complex __z) __INTRODUCED_IN(26);
float complex cpowf(float complex __x, float complex __z) __INTRODUCED_IN(26);
long double complex cpowl(long double complex __x, long double complex __z) __RENAME_LDBL(cpow, 26, 26);
long double complex cpowl(long double complex __x, long double complex __z) __INTRODUCED_IN(26);
/* 7.3.8.3 The csqrt functions */
double complex csqrt(double complex __z) __INTRODUCED_IN(23);
float complex csqrtf(float complex __z) __INTRODUCED_IN(23);
long double complex csqrtl(long double complex __z) __INTRODUCED_IN_32(21) __INTRODUCED_IN_64(23) /*__RENAME_LDBL(csqrt)*/;
long double complex csqrtl(long double complex __z) __INTRODUCED_IN_32(21) __INTRODUCED_IN_64(23);
/* 7.3.9 Manipulation functions */
/* 7.3.9.1 The carg functions */
double carg(double complex __z) __INTRODUCED_IN(23);
float cargf(float complex __z) __INTRODUCED_IN(23);
long double cargl(long double complex __z) __RENAME_LDBL(carg, 23, 23);
long double cargl(long double complex __z) __INTRODUCED_IN(23);
/* 7.3.9.2 The cimag functions */
double cimag(double complex __z) __INTRODUCED_IN(23);
float cimagf(float complex __z) __INTRODUCED_IN(23);
long double cimagl(long double complex __z) __RENAME_LDBL(cimag, 23, 23);
long double cimagl(long double complex __z) __INTRODUCED_IN(23);
/* 7.3.9.3 The conj functions */
double complex conj(double complex __z) __INTRODUCED_IN(23);
float complex conjf(float complex __z) __INTRODUCED_IN(23);
long double complex conjl(long double complex __z) __RENAME_LDBL(conj, 23, 23);
long double complex conjl(long double complex __z) __INTRODUCED_IN(23);
/* 7.3.9.4 The cproj functions */
double complex cproj(double complex __z) __INTRODUCED_IN(23);
float complex cprojf(float complex __z) __INTRODUCED_IN(23);
long double complex cprojl(long double complex __z) __INTRODUCED_IN_32(21) __INTRODUCED_IN_64(23) /*__RENAME_LDBL(cproj)*/;
long double complex cprojl(long double complex __z) __INTRODUCED_IN_32(21) __INTRODUCED_IN_64(23);
/* 7.3.9.5 The creal functions */
double creal(double complex __z) __INTRODUCED_IN(23);
float crealf(float complex __z) __INTRODUCED_IN(23);
long double creall(long double complex __z) __RENAME_LDBL(creal, 23, 23);
long double creall(long double complex __z) __INTRODUCED_IN(23);
__END_DECLS

View file

@ -75,231 +75,231 @@ typedef __float_t float_t;
double acos(double __x);
float acosf(float __x);
long double acosl(long double __x) __RENAME_LDBL(acos, 3, 21);
long double acosl(long double __x);
double asin(double __x);
float asinf(float __x);
long double asinl(long double __x) __RENAME_LDBL(asin, 3, 21);
long double asinl(long double __x);
double atan(double __x);
float atanf(float __x);
long double atanl(long double __x) __RENAME_LDBL(atan, 3, 21);
long double atanl(long double __x);
double atan2(double __y, double __x);
float atan2f(float __y, float __x);
long double atan2l(long double __y, long double __x) __RENAME_LDBL(atan2, 3, 21);
long double atan2l(long double __y, long double __x);
double cos(double __x);
float cosf(float __x);
long double cosl(long double __x) __RENAME_LDBL(cos, 3, 21);
long double cosl(long double __x);
double sin(double __x);
float sinf(float __x);
long double sinl(long double __x) __RENAME_LDBL(sin, 3, 21);
long double sinl(long double __x);
double tan(double __x);
float tanf(float __x);
long double tanl(long double __x) __RENAME_LDBL(tan, 3, 21);
long double tanl(long double __x);
double acosh(double __x);
float acoshf(float __x);
long double acoshl(long double __x) __RENAME_LDBL(acosh, 3, 21);
long double acoshl(long double __x);
double asinh(double __x);
float asinhf(float __x);
long double asinhl(long double __x) __RENAME_LDBL(asinh, 3, 21);
long double asinhl(long double __x);
double atanh(double __x);
float atanhf(float __x);
long double atanhl(long double __x) __RENAME_LDBL(atanh, 3, 21);
long double atanhl(long double __x);
double cosh(double __x);
float coshf(float __x);
long double coshl(long double __x) __RENAME_LDBL(cosh, 3, 21);
long double coshl(long double __x);
double sinh(double __x);
float sinhf(float __x);
long double sinhl(long double __x) __RENAME_LDBL(sinh, 3, 21);
long double sinhl(long double __x);
double tanh(double __x);
float tanhf(float __x);
long double tanhl(long double __x) __RENAME_LDBL(tanh, 3, 21);
long double tanhl(long double __x);
double exp(double __x);
float expf(float __x);
long double expl(long double __x) __RENAME_LDBL(exp, 3, 21);
long double expl(long double __x);
double exp2(double __x);
float exp2f(float __x);
long double exp2l(long double __x) __RENAME_LDBL(exp2, 3, 21);
long double exp2l(long double __x);
double expm1(double __x);
float expm1f(float __x);
long double expm1l(long double __x) __RENAME_LDBL(expm1, 3, 21);
long double expm1l(long double __x);
double frexp(double __x, int* _Nonnull __exponent);
float frexpf(float __x, int* _Nonnull __exponent);
long double frexpl(long double __x, int* _Nonnull __exponent) __RENAME_LDBL(frexp, 3, 21);
long double frexpl(long double __x, int* _Nonnull __exponent);
int ilogb(double __x) __attribute_const__;
int ilogbf(float __x) __attribute_const__;
int ilogbl(long double __x) __RENAME_LDBL(ilogb, 3, 3) __attribute_const__;
int ilogbl(long double __x) __attribute_const__;
double ldexp(double __x, int __exponent);
float ldexpf(float __x, int __exponent);
long double ldexpl(long double __x, int __exponent) __RENAME_LDBL(ldexp, 3, 3);
long double ldexpl(long double __x, int __exponent);
double log(double __x);
float logf(float __x);
long double logl(long double __x) __RENAME_LDBL(log, 3, 21);
long double logl(long double __x);
double log10(double __x);
float log10f(float __x);
long double log10l(long double __x) __RENAME_LDBL(log10, 3, 21);
long double log10l(long double __x);
double log1p(double __x);
float log1pf(float __x);
long double log1pl(long double __x) __RENAME_LDBL(log1p, 3, 21);
long double log1pl(long double __x);
double log2(double __x) __INTRODUCED_IN(18);
float log2f(float __x) __INTRODUCED_IN(18);
long double log2l(long double __x) __RENAME_LDBL(log2, 18, 18);
long double log2l(long double __x);
double logb(double __x);
float logbf(float __x);
long double logbl(long double __x) __RENAME_LDBL(logb, 3, 18);
long double logbl(long double __x);
double modf(double __x, double* _Nonnull __integral_part);
float modff(float __x, float* _Nonnull __integral_part);
long double modfl(long double __x, long double* _Nonnull __integral_part) __RENAME_LDBL(modf, 3, 21);
long double modfl(long double __x, long double* _Nonnull __integral_part);
double scalbn(double __x, int __exponent);
float scalbnf(float __x, int __exponent);
long double scalbnl(long double __x, int __exponent) __RENAME_LDBL(scalbn, 3, 3);
long double scalbnl(long double __x, int __exponent);
double scalbln(double __x, long __exponent);
float scalblnf(float __x, long __exponent);
long double scalblnl(long double __x, long __exponent) __RENAME_LDBL(scalbln, 9, 18);
long double scalblnl(long double __x, long __exponent);
double cbrt(double __x);
float cbrtf(float __x);
long double cbrtl(long double __x) __RENAME_LDBL(cbrt, 3, 21);
long double cbrtl(long double __x);
double fabs(double __x) __attribute_const__;
float fabsf(float __x) __attribute_const__;
long double fabsl(long double __x) __RENAME_LDBL(fabs, 3, 3) __attribute_const__;
long double fabsl(long double __x) __attribute_const__;
double hypot(double __x, double __y);
float hypotf(float __x, float __y);
long double hypotl(long double __x, long double __y) __RENAME_LDBL(hypot, 3, 21);
long double hypotl(long double __x, long double __y);
double pow(double __x, double __y);
float powf(float __x, float __y);
long double powl(long double __x, long double __y) __RENAME_LDBL(pow, 3, 21);
long double powl(long double __x, long double __y);
double sqrt(double __x);
float sqrtf(float __x);
long double sqrtl(long double __x) __RENAME_LDBL(sqrt, 3, 21);
long double sqrtl(long double __x);
double erf(double __x);
float erff(float __x);
long double erfl(long double __x) __RENAME_LDBL(erf, 3, 21);
long double erfl(long double __x);
double erfc(double __x);
float erfcf(float __x);
long double erfcl(long double __x) __RENAME_LDBL(erfc, 3, 21);
long double erfcl(long double __x);
double lgamma(double __x);
float lgammaf(float __x);
long double lgammal(long double __x) __RENAME_LDBL(lgamma, 3, 21);
long double lgammal(long double __x);
double tgamma(double __x);
float tgammaf(float __x);
long double tgammal(long double __x) __RENAME_LDBL(tgamma, 3, 21);
long double tgammal(long double __x);
double ceil(double __x);
float ceilf(float __x);
long double ceill(long double __x) __RENAME_LDBL(ceil, 3, 3);
long double ceill(long double __x);
double floor(double __x);
float floorf(float __x);
long double floorl(long double __x) __RENAME_LDBL(floor, 3, 3);
long double floorl(long double __x);
double nearbyint(double __x);
float nearbyintf(float __x);
long double nearbyintl(long double __x) __RENAME_LDBL(nearbyint, 3, 21);
long double nearbyintl(long double __x);
double rint(double __x);
float rintf(float __x);
long double rintl(long double __x) __RENAME_LDBL(rint, 3, 21);
long double rintl(long double __x);
long lrint(double __x);
long lrintf(float __x);
long lrintl(long double __x) __RENAME_LDBL(lrint, 3, 21);
long lrintl(long double __x);
long long llrint(double __x);
long long llrintf(float __x);
long long llrintl(long double __x) __RENAME_LDBL(llrint, 3, 21);
long long llrintl(long double __x);
double round(double __x);
float roundf(float __x);
long double roundl(long double __x) __RENAME_LDBL(roundl, 3, 3);
long double roundl(long double __x);
long lround(double __x);
long lroundf(float __x);
long lroundl(long double __x) __RENAME_LDBL(lround, 3, 3);
long lroundl(long double __x);
long long llround(double __x);
long long llroundf(float __x);
long long llroundl(long double __x) __RENAME_LDBL(llround, 3, 3);
long long llroundl(long double __x);
double trunc(double __x);
float truncf(float __x);
long double truncl(long double __x) __RENAME_LDBL(trunc, 3, 3);
long double truncl(long double __x);
double fmod(double __x, double __y);
float fmodf(float __x, float __y);
long double fmodl(long double __x, long double __y) __RENAME_LDBL(fmod, 3, 21);
long double fmodl(long double __x, long double __y);
double remainder(double __x, double __y);
float remainderf(float __x, float __y);
long double remainderl(long double __x, long double __y) __RENAME_LDBL(remainder, 3, 21);
long double remainderl(long double __x, long double __y);
double remquo(double __x, double __y, int* _Nonnull __quotient_bits);
float remquof(float __x, float __y, int* _Nonnull __quotient_bits);
long double remquol(long double __x, long double __y, int* _Nonnull __quotient_bits) __RENAME_LDBL(remquo, 3, 21);
long double remquol(long double __x, long double __y, int* _Nonnull __quotient_bits);
double copysign(double __value, double __sign) __attribute_const__;
float copysignf(float __value, float __sign) __attribute_const__;
long double copysignl(long double __value, long double __sign) __RENAME_LDBL(copysign, 3, 3) __attribute_const__;
long double copysignl(long double __value, long double __sign) __attribute_const__;
double nan(const char* _Nonnull __kind) __attribute_const__;
float nanf(const char* _Nonnull __kind) __attribute_const__;
long double nanl(const char* _Nonnull __kind) __RENAME_LDBL(nan, 13, 13) __attribute_const__;
long double nanl(const char* _Nonnull __kind) __attribute_const__;
double nextafter(double __x, double __y);
float nextafterf(float __x, float __y);
long double nextafterl(long double __x, long double __y) __RENAME_LDBL_NO_GUARD_FOR_NDK(nextafter, 3, 21);
long double nextafterl(long double __x, long double __y);
double nexttoward(double __x, long double __y);
float nexttowardf(float __x, long double __y);
long double nexttowardl(long double __x, long double __y) __RENAME_LDBL_NO_GUARD_FOR_NDK(nexttoward, 18, 18);
long double nexttowardl(long double __x, long double __y);
double fdim(double __x, double __y);
float fdimf(float __x, float __y);
long double fdiml(long double __x, long double __y) __RENAME_LDBL(fdim, 3, 3);
long double fdiml(long double __x, long double __y);
double fmax(double __x, double __y) __attribute_const__;
float fmaxf(float __x, float __y) __attribute_const__;
long double fmaxl(long double __x, long double __y) __RENAME_LDBL(fmax, 3, 3) __attribute_const__;
long double fmaxl(long double __x, long double __y) __attribute_const__;
double fmin(double __x, double __y) __attribute_const__;
float fminf(float __x, float __y) __attribute_const__;
long double fminl(long double __x, long double __y) __RENAME_LDBL(fmin, 3, 3) __attribute_const__;
long double fminl(long double __x, long double __y) __attribute_const__;
double fma(double __x, double __y, double __z);
float fmaf(float __x, float __y, float __z);
long double fmal(long double __x, long double __y, long double __z) __RENAME_LDBL_NO_GUARD_FOR_NDK(fma, 3, 21);
long double fmal(long double __x, long double __y, long double __z);
#define isgreater(x, y) __builtin_isgreater((x), (y))
#define isgreaterequal(x, y) __builtin_isgreaterequal((x), (y))

View file

@ -78,7 +78,7 @@ int posix_memalign(void* _Nullable * _Nullable __memptr, size_t __alignment, siz
void* _Nullable aligned_alloc(size_t __alignment, size_t __size) __INTRODUCED_IN(28);
double strtod(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr);
long double strtold(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr) __RENAME_LDBL(strtod, 3, 21);
long double strtold(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr) __INTRODUCED_IN(21);
unsigned long strtoul_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, int __base, locale_t _Nonnull __l) __INTRODUCED_IN(26);

View file

@ -201,29 +201,6 @@
# define __RENAME_IF_FILE_OFFSET64(func)
#endif
/*
* For LP32, `long double` == `double`. Historically many `long double` functions were incorrect
* on x86, missing on most architectures, and even if they are present and correct, linking to
* them just bloats your ELF file by adding extra relocations. The __BIONIC_LP32_USE_LONG_DOUBLE
* macro lets us test the headers both ways (and adds an escape valve).
*
* Note that some functions have their __RENAME_LDBL commented out as a sign that although we could
* use __RENAME_LDBL it would actually cause the function to be introduced later because the
* `long double` variant appeared before the `double` variant.
*
* The _NO_GUARD_FOR_NDK variants keep the __VERSIONER_NO_GUARD behavior working for the NDK. This
* allows libc++ to refer to these functions in inlines without needing to guard them, needed since
* libc++ doesn't currently guard these calls. There's no risk to the apps though because using
* those APIs will still cause a link error.
*/
#if defined(__LP64__) || defined(__BIONIC_LP32_USE_LONG_DOUBLE)
#define __RENAME_LDBL(rewrite,rewrite_api_level,regular_api_level) __INTRODUCED_IN(regular_api_level)
#define __RENAME_LDBL_NO_GUARD_FOR_NDK(rewrite,rewrite_api_level,regular_api_level) __INTRODUCED_IN_NO_GUARD_FOR_NDK(regular_api_level)
#else
#define __RENAME_LDBL(rewrite,rewrite_api_level,regular_api_level) __RENAME(rewrite) __INTRODUCED_IN(rewrite_api_level)
#define __RENAME_LDBL_NO_GUARD_FOR_NDK(rewrite,rewrite_api_level,regular_api_level) __RENAME(rewrite) __INTRODUCED_IN_NO_GUARD_FOR_NDK(rewrite_api_level)
#endif
/*
* On all architectures, `struct stat` == `struct stat64`, but LP32 didn't gain the *64 functions
* until API level 21.

View file

@ -102,7 +102,7 @@ wchar_t* _Nullable wcstok(wchar_t* _Nullable __s, const wchar_t* _Nonnull __deli
long wcstol(const wchar_t* _Nonnull __s, wchar_t* __BIONIC_COMPLICATED_NULLNESS * _Nullable __end_ptr, int __base);
long wcstol_l(const wchar_t* _Nonnull __s, wchar_t* __BIONIC_COMPLICATED_NULLNESS * _Nullable __end_ptr, int __base, locale_t _Nonnull __l) __INTRODUCED_IN(28);
long long wcstoll(const wchar_t* _Nonnull __s, wchar_t* __BIONIC_COMPLICATED_NULLNESS * _Nullable __end_ptr, int __base) __INTRODUCED_IN(21);
long double wcstold(const wchar_t* _Nonnull __s, wchar_t* __BIONIC_COMPLICATED_NULLNESS * _Nullable __end_ptr) __RENAME_LDBL(wcstod, 3, 21);
long double wcstold(const wchar_t* _Nonnull __s, wchar_t* __BIONIC_COMPLICATED_NULLNESS * _Nullable __end_ptr) __INTRODUCED_IN(21);
unsigned long wcstoul(const wchar_t* _Nonnull __s, wchar_t* __BIONIC_COMPLICATED_NULLNESS * _Nullable __end_ptr, int __base);
unsigned long wcstoul_l(const wchar_t* _Nonnull __s, wchar_t* __BIONIC_COMPLICATED_NULLNESS * _Nullable __end_ptr, int __base, locale_t _Nonnull __l) __INTRODUCED_IN(28);
unsigned long long wcstoull(const wchar_t* _Nonnull __s, wchar_t* __BIONIC_COMPLICATED_NULLNESS * _Nullable __end_ptr, int __base) __INTRODUCED_IN(21);

View file

@ -400,7 +400,6 @@ cc_library {
],
cflags: [
"-D__BIONIC_LP32_USE_LONG_DOUBLE",
"-D_BSD_SOURCE",
"-DFLT_EVAL_METHOD=0",
"-include freebsd-compat.h",

View file

@ -386,7 +386,6 @@ cc_test_library {
"bug_26110743_test.cpp",
"byteswap_test.cpp",
"complex_test.cpp",
"complex_force_long_double_test.cpp",
"ctype_test.cpp",
"dirent_test.cpp",
"elf_test.cpp",
@ -423,7 +422,6 @@ cc_test_library {
"malloc_iterate_test.cpp",
"malloc_test.cpp",
"math_test.cpp",
"math_force_long_double_test.cpp",
"membarrier_test.cpp",
"memtag_stack_test.cpp",
"mntent_test.cpp",

View file

@ -1,2 +0,0 @@
#define __BIONIC_LP32_USE_LONG_DOUBLE
#include "complex_test.cpp"

View file

@ -14,12 +14,6 @@
* limitations under the License.
*/
#if defined(__BIONIC_LP32_USE_LONG_DOUBLE)
#define COMPLEX_TEST complex_h_force_long_double
#else
#define COMPLEX_TEST complex_h
#endif
// This file is compiled against both glibc and bionic, and our complex.h
// depends on bionic-specific macros, so hack around that.
#include <sys/cdefs.h>
@ -27,7 +21,6 @@
#define __INTRODUCED_IN(x)
#define __INTRODUCED_IN_32(x)
#define __INTRODUCED_IN_64(x)
#define __RENAME_LDBL(a,b,c)
#endif
// libc++ actively gets in the way of including <complex.h> from C++, so we
@ -62,259 +55,259 @@ inline void PrintTo(const long double _Complex& c, std::ostream* os) {
#include <gtest/gtest.h>
#pragma pop_macro("I")
TEST(COMPLEX_TEST, cabs) {
TEST(complex_h, cabs) {
ASSERT_EQ(0.0, cabs(0));
}
TEST(COMPLEX_TEST, cabsf) {
TEST(complex_h, cabsf) {
ASSERT_EQ(0.0, cabsf(0));
}
TEST(COMPLEX_TEST, cabsl) {
TEST(complex_h, cabsl) {
ASSERT_EQ(0.0, cabsl(0));
}
TEST(COMPLEX_TEST, cacos) {
TEST(complex_h, cacos) {
ASSERT_EQ(M_PI_2, cacos(0.0));
}
TEST(COMPLEX_TEST, cacosf) {
TEST(complex_h, cacosf) {
ASSERT_EQ(static_cast<float>(M_PI_2), cacosf(0.0));
}
TEST(COMPLEX_TEST, cacosl) {
TEST(complex_h, cacosl) {
ASSERT_EQ(M_PI_2l, cacosl(0.0));
}
TEST(COMPLEX_TEST, cacosh) {
TEST(complex_h, cacosh) {
ASSERT_EQ(0.0, cacosh(1.0));
}
TEST(COMPLEX_TEST, cacoshl) {
TEST(complex_h, cacoshl) {
ASSERT_EQ(0.0, cacoshl(1.0));
}
TEST(COMPLEX_TEST, cacoshf) {
TEST(complex_h, cacoshf) {
ASSERT_EQ(0.0, cacoshf(1.0));
}
TEST(COMPLEX_TEST, carg) {
TEST(complex_h, carg) {
ASSERT_EQ(0.0, carg(0));
}
TEST(COMPLEX_TEST, cargf) {
TEST(complex_h, cargf) {
ASSERT_EQ(0.0, cargf(0));
}
TEST(COMPLEX_TEST, cargl) {
TEST(complex_h, cargl) {
ASSERT_EQ(0.0, cargl(0));
}
TEST(COMPLEX_TEST, casin) {
TEST(complex_h, casin) {
ASSERT_EQ(0.0, casin(0));
}
TEST(COMPLEX_TEST, casinf) {
TEST(complex_h, casinf) {
ASSERT_EQ(0.0, casinf(0));
}
TEST(COMPLEX_TEST, casinl) {
TEST(complex_h, casinl) {
ASSERT_EQ(0.0, casinl(0));
}
TEST(COMPLEX_TEST, casinh) {
TEST(complex_h, casinh) {
ASSERT_EQ(0.0, casinh(0));
}
TEST(COMPLEX_TEST, casinhf) {
TEST(complex_h, casinhf) {
ASSERT_EQ(0.0, casinhf(0));
}
TEST(COMPLEX_TEST, casinhl) {
TEST(complex_h, casinhl) {
ASSERT_EQ(0.0, casinhl(0));
}
TEST(COMPLEX_TEST, catan) {
TEST(complex_h, catan) {
ASSERT_EQ(0.0, catan(0));
}
TEST(COMPLEX_TEST, catanf) {
TEST(complex_h, catanf) {
ASSERT_EQ(0.0, catanf(0));
}
TEST(COMPLEX_TEST, catanl) {
TEST(complex_h, catanl) {
ASSERT_EQ(0.0, catanl(0));
}
TEST(COMPLEX_TEST, catanh) {
TEST(complex_h, catanh) {
ASSERT_EQ(0.0, catanh(0));
}
TEST(COMPLEX_TEST, catanhf) {
TEST(complex_h, catanhf) {
ASSERT_EQ(0.0, catanhf(0));
}
TEST(COMPLEX_TEST, catanhl) {
TEST(complex_h, catanhl) {
ASSERT_EQ(0.0, catanhl(0));
}
TEST(COMPLEX_TEST, ccos) {
TEST(complex_h, ccos) {
ASSERT_EQ(1.0, ccos(0));
}
TEST(COMPLEX_TEST, ccosf) {
TEST(complex_h, ccosf) {
ASSERT_EQ(1.0, ccosf(0));
}
TEST(COMPLEX_TEST, ccosl) {
TEST(complex_h, ccosl) {
ASSERT_EQ(1.0, ccosl(0));
}
TEST(COMPLEX_TEST, ccosh) {
TEST(complex_h, ccosh) {
ASSERT_EQ(1.0, ccosh(0));
}
TEST(COMPLEX_TEST, ccoshf) {
TEST(complex_h, ccoshf) {
ASSERT_EQ(1.0, ccoshf(0));
}
TEST(COMPLEX_TEST, ccoshl) {
TEST(complex_h, ccoshl) {
ASSERT_EQ(1.0, ccoshl(0));
}
TEST(COMPLEX_TEST, cexp) {
TEST(complex_h, cexp) {
ASSERT_EQ(1.0, cexp(0));
}
TEST(COMPLEX_TEST, cexpf) {
TEST(complex_h, cexpf) {
ASSERT_EQ(1.0, cexpf(0));
}
TEST(COMPLEX_TEST, cexpl) {
TEST(complex_h, cexpl) {
ASSERT_EQ(1.0, cexpl(0));
}
TEST(COMPLEX_TEST, cimag) {
TEST(complex_h, cimag) {
ASSERT_EQ(0.0, cimag(0));
}
TEST(COMPLEX_TEST, cimagf) {
TEST(complex_h, cimagf) {
ASSERT_EQ(0.0f, cimagf(0));
}
TEST(COMPLEX_TEST, cimagl) {
TEST(complex_h, cimagl) {
ASSERT_EQ(0.0, cimagl(0));
}
TEST(COMPLEX_TEST, clog) {
TEST(complex_h, clog) {
ASSERT_EQ(0.0, clog(1.0));
}
TEST(COMPLEX_TEST, clogf) {
TEST(complex_h, clogf) {
ASSERT_EQ(0.0f, clogf(1.0f));
}
TEST(COMPLEX_TEST, clogl) {
TEST(complex_h, clogl) {
ASSERT_EQ(0.0L, clogl(1.0L));
}
TEST(COMPLEX_TEST, conj) {
TEST(complex_h, conj) {
ASSERT_EQ(0.0, conj(0));
}
TEST(COMPLEX_TEST, conjf) {
TEST(complex_h, conjf) {
ASSERT_EQ(0.0f, conjf(0));
}
TEST(COMPLEX_TEST, conjl) {
TEST(complex_h, conjl) {
ASSERT_EQ(0.0, conjl(0));
}
TEST(COMPLEX_TEST, cpow) {
TEST(complex_h, cpow) {
ASSERT_EQ(8.0, cpow(2.0, 3.0));
}
TEST(COMPLEX_TEST, cpowf) {
TEST(complex_h, cpowf) {
ASSERT_EQ(8.0f, cpowf(2.0f, 3.0f));
}
TEST(COMPLEX_TEST, cpowl) {
TEST(complex_h, cpowl) {
ASSERT_EQ(8.0L, cpowl(2.0L, 3.0L));
}
TEST(COMPLEX_TEST, cproj) {
TEST(complex_h, cproj) {
ASSERT_EQ(0.0, cproj(0));
}
TEST(COMPLEX_TEST, cprojf) {
TEST(complex_h, cprojf) {
ASSERT_EQ(0.0f, cprojf(0));
}
TEST(COMPLEX_TEST, cprojl) {
TEST(complex_h, cprojl) {
ASSERT_EQ(0.0, cprojl(0));
}
TEST(COMPLEX_TEST, creal) {
TEST(complex_h, creal) {
ASSERT_EQ(2.0, creal(2.0 + 3.0I));
}
TEST(COMPLEX_TEST, crealf) {
TEST(complex_h, crealf) {
ASSERT_EQ(2.0f, crealf(2.0f + 3.0fI));
}
TEST(COMPLEX_TEST, creall) {
TEST(complex_h, creall) {
ASSERT_EQ(2.0, creall(2.0L + 3.0LI));
}
TEST(COMPLEX_TEST, csin) {
TEST(complex_h, csin) {
ASSERT_EQ(0.0, csin(0));
}
TEST(COMPLEX_TEST, csinf) {
TEST(complex_h, csinf) {
ASSERT_EQ(0.0, csinf(0));
}
TEST(COMPLEX_TEST, csinl) {
TEST(complex_h, csinl) {
ASSERT_EQ(0.0, csinl(0));
}
TEST(COMPLEX_TEST, csinh) {
TEST(complex_h, csinh) {
ASSERT_EQ(0.0, csinh(0));
}
TEST(COMPLEX_TEST, csinhf) {
TEST(complex_h, csinhf) {
ASSERT_EQ(0.0, csinhf(0));
}
TEST(COMPLEX_TEST, csinhl) {
TEST(complex_h, csinhl) {
ASSERT_EQ(0.0, csinhl(0));
}
TEST(COMPLEX_TEST, csqrt) {
TEST(complex_h, csqrt) {
ASSERT_EQ(0.0, csqrt(0));
}
TEST(COMPLEX_TEST, csqrtf) {
TEST(complex_h, csqrtf) {
ASSERT_EQ(0.0f, csqrtf(0));
}
TEST(COMPLEX_TEST, csqrtl) {
TEST(complex_h, csqrtl) {
ASSERT_EQ(0.0, csqrtl(0));
}
TEST(COMPLEX_TEST, ctan) {
TEST(complex_h, ctan) {
ASSERT_EQ(0.0, ctan(0));
}
TEST(COMPLEX_TEST, ctanf) {
TEST(complex_h, ctanf) {
ASSERT_EQ(0.0, ctanf(0));
}
TEST(COMPLEX_TEST, ctanl) {
TEST(complex_h, ctanl) {
ASSERT_EQ(0.0, ctanl(0));
}
TEST(COMPLEX_TEST, ctanh) {
TEST(complex_h, ctanh) {
ASSERT_EQ(0.0, ctanh(0));
double complex z;
@ -335,7 +328,7 @@ TEST(COMPLEX_TEST, ctanh) {
ASSERT_TRUE(isnan(cimag(z)));
}
TEST(COMPLEX_TEST, ctanhf) {
TEST(complex_h, ctanhf) {
ASSERT_EQ(0.0f, ctanhf(0.0f));
float complex z;
@ -356,7 +349,7 @@ TEST(COMPLEX_TEST, ctanhf) {
ASSERT_TRUE(isnan(cimagf(z)));
}
TEST(COMPLEX_TEST, ctanhl) {
TEST(complex_h, ctanhl) {
ASSERT_EQ(0.0L, ctanhl(0.0L));
long double complex z;

View file

@ -1,2 +0,0 @@
#define __BIONIC_LP32_USE_LONG_DOUBLE
#include "math_test.cpp"

File diff suppressed because it is too large Load diff