[llvm] r221949 - Fix the VS 2012 build

Reid Kleckner reid at kleckner.net
Thu Nov 13 15:45:51 PST 2014


Author: rnk
Date: Thu Nov 13 17:45:50 2014
New Revision: 221949

URL: http://llvm.org/viewvc/llvm-project?rev=221949&view=rev
Log:
Fix the VS 2012 build

VS 2012 doesn't have fminf or fmaxf.

Modified:
    llvm/trunk/lib/Support/Windows/explicit_symbols.inc

Modified: llvm/trunk/lib/Support/Windows/explicit_symbols.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/explicit_symbols.inc?rev=221949&r1=221948&r2=221949&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/explicit_symbols.inc (original)
+++ llvm/trunk/lib/Support/Windows/explicit_symbols.inc Thu Nov 13 17:45:50 2014
@@ -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
 





More information about the llvm-commits mailing list