From b280e72a97736930063e947fe5fcda7a191e7b10 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Thu, 24 Apr 2014 12:35:40 -0700
Subject: [PATCH] Bump __clang_minor__ check to 6 for __builtin_isnan

It appears that upstream 3.5 still can't accept __builtin_isnan redeclared
with calling convention, eg.

cat > isnan.c <<EOF
int __builtin_isnan(double) __attribute__((pcs("aapcs")));
EOF

  clang  -target armv5te-none-linux-androideabi -c isnan.c
  isnan.c:1:5: error: function declared 'aapcs' here was previously declared without calling convention
  int __builtin_isnan(double) __attribute__((pcs("aapcs")));
      ^
  isnan.c:1:5: note: previous declaration is here

Change-Id: Iff466fd913c3deec27aa3ff355a208543028d368
---
 ndk/platforms/android-13/include/math.h | 2 +-
 ndk/platforms/android-18/include/math.h | 2 +-
 ndk/platforms/android-3/include/math.h  | 2 +-
 ndk/platforms/android-9/include/math.h  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ndk/platforms/android-13/include/math.h b/ndk/platforms/android-13/include/math.h
index 408f2626e..3d06e6239 100644
--- a/ndk/platforms/android-13/include/math.h
+++ b/ndk/platforms/android-13/include/math.h
@@ -528,7 +528,7 @@ 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__ >= 5)
+#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
 int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
 #else
 /* clang < 3.5 has faulty prototype for __builtin_isnan */
diff --git a/ndk/platforms/android-18/include/math.h b/ndk/platforms/android-18/include/math.h
index e24c00117..d565fa7fd 100644
--- a/ndk/platforms/android-18/include/math.h
+++ b/ndk/platforms/android-18/include/math.h
@@ -533,7 +533,7 @@ 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__ >= 5)
+#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
 int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
 #else
 /* clang < 3.5 has faulty prototype for __builtin_isnan */
diff --git a/ndk/platforms/android-3/include/math.h b/ndk/platforms/android-3/include/math.h
index b57229815..15d53a166 100644
--- a/ndk/platforms/android-3/include/math.h
+++ b/ndk/platforms/android-3/include/math.h
@@ -523,7 +523,7 @@ 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__ >= 5)
+#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
 int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
 #else
 /* clang < 3.5 has faulty prototype for __builtin_isnan */
diff --git a/ndk/platforms/android-9/include/math.h b/ndk/platforms/android-9/include/math.h
index 97c76d320..e72c94b0e 100644
--- a/ndk/platforms/android-9/include/math.h
+++ b/ndk/platforms/android-9/include/math.h
@@ -523,7 +523,7 @@ 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__ >= 5)
+#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
 int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
 #else
 /* clang < 3.5 has faulty prototype for __builtin_isnan */