From: Reid Kleckner <reid@kleckner.net>
Date: Thu, 13 Nov 2014 23:45:50 +0000 (+0000)
Subject: Fix the VS 2012 build
X-Git-Tag: android-x86-7.1-r4~55507
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=53c7d53c503e054c4e843d0647aadd5d6a848d1a;p=android-x86%2Fexternal-llvm.git

Fix the VS 2012 build

VS 2012 doesn't have fminf or fmaxf.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221949 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Support/Windows/explicit_symbols.inc b/lib/Support/Windows/explicit_symbols.inc
index 5f3818919d2..79e13a65f91 100644
--- a/lib/Support/Windows/explicit_symbols.inc
+++ b/lib/Support/Windows/explicit_symbols.inc
@@ -71,15 +71,10 @@
   INLINE_DEF_FLOAT_SYMBOL(atanf, 1)
   INLINE_DEF_FLOAT_SYMBOL(atan2f, 2)
   INLINE_DEF_FLOAT_SYMBOL(ceilf, 1)
-#if (_MSC_VER==1800)
-  INLINE_DEF_FLOAT_SYMBOL(copysignf, 2)
-#endif
   INLINE_DEF_FLOAT_SYMBOL(cosf, 1)
   INLINE_DEF_FLOAT_SYMBOL(coshf, 1)
   INLINE_DEF_FLOAT_SYMBOL(expf, 1)
   INLINE_DEF_FLOAT_SYMBOL(floorf, 1)
-  INLINE_DEF_FLOAT_SYMBOL(fminf, 2)
-  INLINE_DEF_FLOAT_SYMBOL(fmaxf, 2)
   INLINE_DEF_FLOAT_SYMBOL(fmodf, 2)
   INLINE_DEF_FLOAT_SYMBOL(logf, 1)
   INLINE_DEF_FLOAT_SYMBOL(powf, 2)
@@ -88,6 +83,13 @@
   INLINE_DEF_FLOAT_SYMBOL(sqrtf, 1)
   INLINE_DEF_FLOAT_SYMBOL(tanf, 1)
   INLINE_DEF_FLOAT_SYMBOL(tanhf, 1)
+
+  // These were added in VS 2013.
+#if (_MSC_VER < 1900)
+  INLINE_DEF_FLOAT_SYMBOL(copysignf, 2)
+  INLINE_DEF_FLOAT_SYMBOL(fminf, 2)
+  INLINE_DEF_FLOAT_SYMBOL(fmaxf, 2)
+#endif
 #undef INLINE_DEF_FLOAT_SYMBOL
 #endif