From: Reid Kleckner Date: Thu, 13 Nov 2014 23:45:50 +0000 (+0000) Subject: Fix the VS 2012 build X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ffafda277d0b42191e03ae11919487d946f2a853;p=platform%2Fupstream%2Fllvm.git Fix the VS 2012 build VS 2012 doesn't have fminf or fmaxf. llvm-svn: 221949 --- diff --git a/llvm/lib/Support/Windows/explicit_symbols.inc b/llvm/lib/Support/Windows/explicit_symbols.inc index 5f38189..79e13a6 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