Merge "Drop clang version check for __builtin_isinf and __builtin_isnan"

This commit is contained in:
Andrew Hsieh
2015-01-29 19:29:12 +00:00
committed by Gerrit Code Review
5 changed files with 9 additions and 15 deletions

View File

@@ -528,10 +528,9 @@ 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__ >= 7)
#if !defined(__clang__)
/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else
/* clang < 3.5 has faulty prototype for __builtin_isnan */
#endif
double __builtin_lgamma(double) __NDK_FPABI_MATH__;
long long __builtin_llrint(double) __NDK_FPABI_MATH__;

View File

@@ -533,10 +533,9 @@ 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__ >= 7)
#if !defined(__clang__)
/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else
/* clang < 3.5 has faulty prototype for __builtin_isnan */
#endif
double __builtin_lgamma(double) __NDK_FPABI_MATH__;
long long __builtin_llrint(double) __NDK_FPABI_MATH__;

View File

@@ -512,12 +512,10 @@ double __builtin_expm1(double) __NDK_FPABI_MATH__;
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;
#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7)
#if !defined(__clang__)
/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */
int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2;
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else
/* clang < 3.5 has faulty prototype for __builtin_isnan */
#endif
double __builtin_lgamma(double) __NDK_FPABI_MATH__;
long long __builtin_llrint(double) __NDK_FPABI_MATH__;

View File

@@ -523,10 +523,9 @@ 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__ >= 7)
#if !defined(__clang__)
/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else
/* clang < 3.5 has faulty prototype for __builtin_isnan */
#endif
double __builtin_lgamma(double) __NDK_FPABI_MATH__;
long long __builtin_llrint(double) __NDK_FPABI_MATH__;

View File

@@ -523,10 +523,9 @@ 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__ >= 7)
#if !defined(__clang__)
/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else
/* clang < 3.5 has faulty prototype for __builtin_isnan */
#endif
double __builtin_lgamma(double) __NDK_FPABI_MATH__;
long long __builtin_llrint(double) __NDK_FPABI_MATH__;