summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Support
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2014-11-13 23:45:50 +0000
committerReid Kleckner <reid@kleckner.net>2014-11-13 23:45:50 +0000
commitffafda277d0b42191e03ae11919487d946f2a853 (patch)
treea5759a94614053c06ac7f3b9c0abc459e7b64322 /llvm/lib/Support
parentd5c4196cb6a13f76b68accd1f76f0fecc7785f46 (diff)
downloadbcm5719-llvm-ffafda277d0b42191e03ae11919487d946f2a853.tar.gz
bcm5719-llvm-ffafda277d0b42191e03ae11919487d946f2a853.zip
Fix the VS 2012 build
VS 2012 doesn't have fminf or fmaxf. llvm-svn: 221949
Diffstat (limited to 'llvm/lib/Support')
-rw-r--r--llvm/lib/Support/Windows/explicit_symbols.inc12
1 files changed, 7 insertions, 5 deletions
diff --git a/llvm/lib/Support/Windows/explicit_symbols.inc b/llvm/lib/Support/Windows/explicit_symbols.inc
index 5f3818919d2..79e13a65f91 100644
--- a/llvm/lib/Support/Windows/explicit_symbols.inc
+++ b/llvm/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
OpenPOWER on IntegriCloud