diff options
| author | Stephen Hines <srhines@google.com> | 2014-11-27 14:01:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-27 14:01:29 +0000 |
| commit | e6eca20c06c6cd8f1dea5a26151787f2341df093 (patch) | |
| tree | 3a323b2ef2453cff9146b0037c97411495b9a8a9 /9/platforms/android-16 | |
| parent | 37c97fffd0fe2582f4c478fcbb46de105d1087cf (diff) | |
| parent | b438fd33a00394924c0a75340e4e81f08377c732 (diff) | |
| download | prebuilts_ndk-e6eca20c06c6cd8f1dea5a26151787f2341df093.zip prebuilts_ndk-e6eca20c06c6cd8f1dea5a26151787f2341df093.tar.gz prebuilts_ndk-e6eca20c06c6cd8f1dea5a26151787f2341df093.tar.bz2 | |
am b438fd33: am 5a08b2e8: Merge "Update __builtin_isnan() WAR to be >= 3.7, since this is still not fixed."
* commit 'b438fd33a00394924c0a75340e4e81f08377c732':
Update __builtin_isnan() WAR to be >= 3.7, since this is still not fixed.
Diffstat (limited to '9/platforms/android-16')
| -rw-r--r-- | 9/platforms/android-16/arch-arm/usr/include/math.h | 4 | ||||
| -rw-r--r-- | 9/platforms/android-16/arch-mips/usr/include/math.h | 4 | ||||
| -rw-r--r-- | 9/platforms/android-16/arch-x86/usr/include/math.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/9/platforms/android-16/arch-arm/usr/include/math.h b/9/platforms/android-16/arch-arm/usr/include/math.h index 3d06e62..7fe24b9 100644 --- a/9/platforms/android-16/arch-arm/usr/include/math.h +++ b/9/platforms/android-16/arch-arm/usr/include/math.h @@ -528,10 +528,10 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; /* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ -#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6) +#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7) int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; #else -/* clang < 3.5 has faulty prototype for __builtin_isnan */ +/* clang < 3.7 has faulty prototype for __builtin_isnan */ #endif double __builtin_lgamma(double) __NDK_FPABI_MATH__; long long __builtin_llrint(double) __NDK_FPABI_MATH__; diff --git a/9/platforms/android-16/arch-mips/usr/include/math.h b/9/platforms/android-16/arch-mips/usr/include/math.h index 3d06e62..7fe24b9 100644 --- a/9/platforms/android-16/arch-mips/usr/include/math.h +++ b/9/platforms/android-16/arch-mips/usr/include/math.h @@ -528,10 +528,10 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; /* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ -#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6) +#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7) int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; #else -/* clang < 3.5 has faulty prototype for __builtin_isnan */ +/* clang < 3.7 has faulty prototype for __builtin_isnan */ #endif double __builtin_lgamma(double) __NDK_FPABI_MATH__; long long __builtin_llrint(double) __NDK_FPABI_MATH__; diff --git a/9/platforms/android-16/arch-x86/usr/include/math.h b/9/platforms/android-16/arch-x86/usr/include/math.h index 3d06e62..7fe24b9 100644 --- a/9/platforms/android-16/arch-x86/usr/include/math.h +++ b/9/platforms/android-16/arch-x86/usr/include/math.h @@ -528,10 +528,10 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; /* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ -#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6) +#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7) int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; #else -/* clang < 3.5 has faulty prototype for __builtin_isnan */ +/* clang < 3.7 has faulty prototype for __builtin_isnan */ #endif double __builtin_lgamma(double) __NDK_FPABI_MATH__; long long __builtin_llrint(double) __NDK_FPABI_MATH__; |