Merge "Update __builtin_isnan() WAR to be >= 3.7, since this is still not fixed."
diff --git a/9/platforms/android-12/arch-arm/usr/include/math.h b/9/platforms/android-12/arch-arm/usr/include/math.h
index e72c94b..5730cd4 100644
--- a/9/platforms/android-12/arch-arm/usr/include/math.h
+++ b/9/platforms/android-12/arch-arm/usr/include/math.h
@@ -523,10 +523,10 @@
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-12/arch-mips/usr/include/math.h b/9/platforms/android-12/arch-mips/usr/include/math.h
index e72c94b..5730cd4 100644
--- a/9/platforms/android-12/arch-mips/usr/include/math.h
+++ b/9/platforms/android-12/arch-mips/usr/include/math.h
@@ -523,10 +523,10 @@
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-12/arch-x86/usr/include/math.h b/9/platforms/android-12/arch-x86/usr/include/math.h
index e72c94b..5730cd4 100644
--- a/9/platforms/android-12/arch-x86/usr/include/math.h
+++ b/9/platforms/android-12/arch-x86/usr/include/math.h
@@ -523,10 +523,10 @@
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-13/arch-arm/usr/include/math.h b/9/platforms/android-13/arch-arm/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-13/arch-arm/usr/include/math.h
+++ b/9/platforms/android-13/arch-arm/usr/include/math.h
@@ -528,10 +528,10 @@
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-13/arch-mips/usr/include/math.h b/9/platforms/android-13/arch-mips/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-13/arch-mips/usr/include/math.h
+++ b/9/platforms/android-13/arch-mips/usr/include/math.h
@@ -528,10 +528,10 @@
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-13/arch-x86/usr/include/math.h b/9/platforms/android-13/arch-x86/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-13/arch-x86/usr/include/math.h
+++ b/9/platforms/android-13/arch-x86/usr/include/math.h
@@ -528,10 +528,10 @@
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-14/arch-arm/usr/include/math.h b/9/platforms/android-14/arch-arm/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-14/arch-arm/usr/include/math.h
+++ b/9/platforms/android-14/arch-arm/usr/include/math.h
@@ -528,10 +528,10 @@
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-14/arch-mips/usr/include/math.h b/9/platforms/android-14/arch-mips/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-14/arch-mips/usr/include/math.h
+++ b/9/platforms/android-14/arch-mips/usr/include/math.h
@@ -528,10 +528,10 @@
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-14/arch-x86/usr/include/math.h b/9/platforms/android-14/arch-x86/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-14/arch-x86/usr/include/math.h
+++ b/9/platforms/android-14/arch-x86/usr/include/math.h
@@ -528,10 +528,10 @@
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-15/arch-arm/usr/include/math.h b/9/platforms/android-15/arch-arm/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-15/arch-arm/usr/include/math.h
+++ b/9/platforms/android-15/arch-arm/usr/include/math.h
@@ -528,10 +528,10 @@
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-15/arch-mips/usr/include/math.h b/9/platforms/android-15/arch-mips/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-15/arch-mips/usr/include/math.h
+++ b/9/platforms/android-15/arch-mips/usr/include/math.h
@@ -528,10 +528,10 @@
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-15/arch-x86/usr/include/math.h b/9/platforms/android-15/arch-x86/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-15/arch-x86/usr/include/math.h
+++ b/9/platforms/android-15/arch-x86/usr/include/math.h
@@ -528,10 +528,10 @@
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-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_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_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_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-17/arch-arm/usr/include/math.h b/9/platforms/android-17/arch-arm/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-17/arch-arm/usr/include/math.h
+++ b/9/platforms/android-17/arch-arm/usr/include/math.h
@@ -528,10 +528,10 @@
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-17/arch-mips/usr/include/math.h b/9/platforms/android-17/arch-mips/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-17/arch-mips/usr/include/math.h
+++ b/9/platforms/android-17/arch-mips/usr/include/math.h
@@ -528,10 +528,10 @@
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-17/arch-x86/usr/include/math.h b/9/platforms/android-17/arch-x86/usr/include/math.h
index 3d06e62..7fe24b9 100644
--- a/9/platforms/android-17/arch-x86/usr/include/math.h
+++ b/9/platforms/android-17/arch-x86/usr/include/math.h
@@ -528,10 +528,10 @@
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-18/arch-arm/usr/include/math.h b/9/platforms/android-18/arch-arm/usr/include/math.h
index d565fa7..042c98c 100644
--- a/9/platforms/android-18/arch-arm/usr/include/math.h
+++ b/9/platforms/android-18/arch-arm/usr/include/math.h
@@ -533,10 +533,10 @@
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-18/arch-mips/usr/include/math.h b/9/platforms/android-18/arch-mips/usr/include/math.h
index d565fa7..042c98c 100644
--- a/9/platforms/android-18/arch-mips/usr/include/math.h
+++ b/9/platforms/android-18/arch-mips/usr/include/math.h
@@ -533,10 +533,10 @@
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-18/arch-x86/usr/include/math.h b/9/platforms/android-18/arch-x86/usr/include/math.h
index d565fa7..042c98c 100644
--- a/9/platforms/android-18/arch-x86/usr/include/math.h
+++ b/9/platforms/android-18/arch-x86/usr/include/math.h
@@ -533,10 +533,10 @@
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-19/arch-arm/usr/include/math.h b/9/platforms/android-19/arch-arm/usr/include/math.h
index d565fa7..042c98c 100644
--- a/9/platforms/android-19/arch-arm/usr/include/math.h
+++ b/9/platforms/android-19/arch-arm/usr/include/math.h
@@ -533,10 +533,10 @@
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-19/arch-mips/usr/include/math.h b/9/platforms/android-19/arch-mips/usr/include/math.h
index d565fa7..042c98c 100644
--- a/9/platforms/android-19/arch-mips/usr/include/math.h
+++ b/9/platforms/android-19/arch-mips/usr/include/math.h
@@ -533,10 +533,10 @@
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-19/arch-x86/usr/include/math.h b/9/platforms/android-19/arch-x86/usr/include/math.h
index d565fa7..042c98c 100644
--- a/9/platforms/android-19/arch-x86/usr/include/math.h
+++ b/9/platforms/android-19/arch-x86/usr/include/math.h
@@ -533,10 +533,10 @@
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-21/arch-arm/usr/include/math.h b/9/platforms/android-21/arch-arm/usr/include/math.h
index e872388..0b711f7 100644
--- a/9/platforms/android-21/arch-arm/usr/include/math.h
+++ b/9/platforms/android-21/arch-arm/usr/include/math.h
@@ -517,7 +517,7 @@
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 */
+/* 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-21/arch-arm64/usr/include/math.h b/9/platforms/android-21/arch-arm64/usr/include/math.h
index e872388..0b711f7 100644
--- a/9/platforms/android-21/arch-arm64/usr/include/math.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/math.h
@@ -517,7 +517,7 @@
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 */
+/* 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-21/arch-mips/usr/include/math.h b/9/platforms/android-21/arch-mips/usr/include/math.h
index e872388..0b711f7 100644
--- a/9/platforms/android-21/arch-mips/usr/include/math.h
+++ b/9/platforms/android-21/arch-mips/usr/include/math.h
@@ -517,7 +517,7 @@
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 */
+/* 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-21/arch-mips64/usr/include/math.h b/9/platforms/android-21/arch-mips64/usr/include/math.h
index e872388..0b711f7 100644
--- a/9/platforms/android-21/arch-mips64/usr/include/math.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/math.h
@@ -517,7 +517,7 @@
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 */
+/* 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-21/arch-x86/usr/include/math.h b/9/platforms/android-21/arch-x86/usr/include/math.h
index e872388..0b711f7 100644
--- a/9/platforms/android-21/arch-x86/usr/include/math.h
+++ b/9/platforms/android-21/arch-x86/usr/include/math.h
@@ -517,7 +517,7 @@
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 */
+/* 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-21/arch-x86_64/usr/include/math.h b/9/platforms/android-21/arch-x86_64/usr/include/math.h
index e872388..0b711f7 100644
--- a/9/platforms/android-21/arch-x86_64/usr/include/math.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/math.h
@@ -517,7 +517,7 @@
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 */
+/* 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-3/arch-arm/usr/include/math.h b/9/platforms/android-3/arch-arm/usr/include/math.h
index 15d53a1..0706a1f 100644
--- a/9/platforms/android-3/arch-arm/usr/include/math.h
+++ b/9/platforms/android-3/arch-arm/usr/include/math.h
@@ -523,10 +523,10 @@
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-4/arch-arm/usr/include/math.h b/9/platforms/android-4/arch-arm/usr/include/math.h
index 15d53a1..0706a1f 100644
--- a/9/platforms/android-4/arch-arm/usr/include/math.h
+++ b/9/platforms/android-4/arch-arm/usr/include/math.h
@@ -523,10 +523,10 @@
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-5/arch-arm/usr/include/math.h b/9/platforms/android-5/arch-arm/usr/include/math.h
index 15d53a1..0706a1f 100644
--- a/9/platforms/android-5/arch-arm/usr/include/math.h
+++ b/9/platforms/android-5/arch-arm/usr/include/math.h
@@ -523,10 +523,10 @@
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-8/arch-arm/usr/include/math.h b/9/platforms/android-8/arch-arm/usr/include/math.h
index 15d53a1..0706a1f 100644
--- a/9/platforms/android-8/arch-arm/usr/include/math.h
+++ b/9/platforms/android-8/arch-arm/usr/include/math.h
@@ -523,10 +523,10 @@
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-9/arch-arm/usr/include/math.h b/9/platforms/android-9/arch-arm/usr/include/math.h
index e72c94b..5730cd4 100644
--- a/9/platforms/android-9/arch-arm/usr/include/math.h
+++ b/9/platforms/android-9/arch-arm/usr/include/math.h
@@ -523,10 +523,10 @@
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-9/arch-mips/usr/include/math.h b/9/platforms/android-9/arch-mips/usr/include/math.h
index e72c94b..5730cd4 100644
--- a/9/platforms/android-9/arch-mips/usr/include/math.h
+++ b/9/platforms/android-9/arch-mips/usr/include/math.h
@@ -523,10 +523,10 @@
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-9/arch-x86/usr/include/math.h b/9/platforms/android-9/arch-x86/usr/include/math.h
index e72c94b..5730cd4 100644
--- a/9/platforms/android-9/arch-x86/usr/include/math.h
+++ b/9/platforms/android-9/arch-x86/usr/include/math.h
@@ -523,10 +523,10 @@
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__;
