LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am d445647f: am 575bd012: am d9abded2: am 7a432f8c: am 11728ce9: Merge "Workaround the __builtin_isnan() type error for clang 3.4."

Browse Source 
* commit 'd445647f01c0cae9ab4d415f9178af91212fe83f':
  Workaround the __builtin_isnan() type error for clang 3.4.
This commit is contained in:
Andrew Hsieh
2014-01-09 21:36:58 +00:00
committed by Android Git Automerger
parent fa865696d0 d445647f01
commit 1822cbc2cc
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ndk/platforms/android-13/include/math.h
View File

@@ -528,10 +528,10 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__;
double __builtin_hypot(double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__;
int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
/* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ /* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */
#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4) #if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5)
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else #else
/* clang < 3.4 has faulty prototype for __builtin_isnan */ /* clang < 3.5 has faulty prototype for __builtin_isnan */
#endif #endif
double __builtin_lgamma(double) __NDK_FPABI_MATH__; double __builtin_lgamma(double) __NDK_FPABI_MATH__;
long long __builtin_llrint(double) __NDK_FPABI_MATH__; long long __builtin_llrint(double) __NDK_FPABI_MATH__;

4
ndk/platforms/android-18/include/math.h
View File

@@ -533,7 +533,7 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__;
double __builtin_hypot(double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__;
int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
/* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ /* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */
#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4) #if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5)
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else #else
/* clang < 3.4 has faulty prototype for __builtin_isnan */ /* clang < 3.4 has faulty prototype for __builtin_isnan */
@@ -686,7 +686,7 @@ long double __builtin_modfl(long double, long double *) __NDK_FPABI_MATH__; /* f
long double __builtin_nanl(const char *) __NDK_FPABI_MATH__ __pure2; long double __builtin_nanl(const char *) __NDK_FPABI_MATH__ __pure2;
long double __builtin_nearbyintl(long double) __NDK_FPABI_MATH__; long double __builtin_nearbyintl(long double) __NDK_FPABI_MATH__;
long double __builtin_nextafterl(long double, long double) __NDK_FPABI_MATH__; long double __builtin_nextafterl(long double, long double) __NDK_FPABI_MATH__;
#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4) #if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5)
double __builtin_nexttoward(double, long double) __NDK_FPABI_MATH__; double __builtin_nexttoward(double, long double) __NDK_FPABI_MATH__;
float __builtin_nexttowardf(float, long double) __NDK_FPABI_MATH__; float __builtin_nexttowardf(float, long double) __NDK_FPABI_MATH__;
#else #else

4
ndk/platforms/android-3/include/math.h
View File

@@ -523,10 +523,10 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__;
double __builtin_hypot(double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__;
int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
/* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ /* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */
#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4) #if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5)
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else #else
/* clang < 3.4 has faulty prototype for __builtin_isnan */ /* clang < 3.5 has faulty prototype for __builtin_isnan */
#endif #endif
double __builtin_lgamma(double) __NDK_FPABI_MATH__; double __builtin_lgamma(double) __NDK_FPABI_MATH__;
long long __builtin_llrint(double) __NDK_FPABI_MATH__; long long __builtin_llrint(double) __NDK_FPABI_MATH__;

4
ndk/platforms/android-9/include/math.h
View File

@@ -523,10 +523,10 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__;
double __builtin_hypot(double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__;
int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
/* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ /* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */
#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4) #if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5)
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else #else
/* clang < 3.4 has faulty prototype for __builtin_isnan */ /* clang < 3.5 has faulty prototype for __builtin_isnan */
#endif #endif
double __builtin_lgamma(double) __NDK_FPABI_MATH__; double __builtin_lgamma(double) __NDK_FPABI_MATH__;
long long __builtin_llrint(double) __NDK_FPABI_MATH__; long long __builtin_llrint(double) __NDK_FPABI_MATH__;