From 8fc6fcdfab33f147a1750ee17fad6dc1da5ee6d6 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 12 Jun 2023 10:22:12 -0700 Subject: [PATCH] : stop using __INTRODUCED_IN_(32|64). Although the existing annotations were strictly true (see https://github.com/android/ndk/issues/1888#issuecomment-1581773348 for the gory details), given the Play Store requirement that 32-bit code must have a 64-bit version, it's not obviously useful to offer a function for 32-bit before 64-bit. Test: treehugger Change-Id: I8ca11b874c26dfaa632690f510cb5409d95012e9 --- libc/include/complex.h | 6 +++--- tests/complex_test.cpp | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libc/include/complex.h b/libc/include/complex.h index 6bbeda3ab..f205abdba 100644 --- a/libc/include/complex.h +++ b/libc/include/complex.h @@ -117,7 +117,7 @@ long double complex clogl(long double complex __z) __INTRODUCED_IN(26); /* 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); +long double cabsl(long double complex __z) __INTRODUCED_IN(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); @@ -125,7 +125,7 @@ long double complex cpowl(long double complex __x, long double complex __z) __IN /* 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); +long double complex csqrtl(long double complex __z) __INTRODUCED_IN(23); /* 7.3.9 Manipulation functions */ /* 7.3.9.1 The carg functions */ @@ -143,7 +143,7 @@ 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); +long double complex cprojl(long double complex __z) __INTRODUCED_IN(23); /* 7.3.9.5 The creal functions */ double creal(double complex __z) __INTRODUCED_IN(23); float crealf(float complex __z) __INTRODUCED_IN(23); diff --git a/tests/complex_test.cpp b/tests/complex_test.cpp index d27861a7c..6a1831f78 100644 --- a/tests/complex_test.cpp +++ b/tests/complex_test.cpp @@ -19,8 +19,6 @@ #include #if !defined(__INTRODUCED_IN) #define __INTRODUCED_IN(x) -#define __INTRODUCED_IN_32(x) -#define __INTRODUCED_IN_64(x) #endif // libc++ actively gets in the way of including from C++, so we