aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-12-02 10:24:37 +0100
committerLukas Larsson <[email protected]>2014-12-02 10:24:37 +0100
commita2ca3b6efd40d0f313d8dac1e7161f32182cd875 (patch)
tree4fe8789ea7c093ca80b354280491b56ff250c954
parent877523d94b66daac4212cb2ddf8148c2c1e404cd (diff)
parent5266be37c198b7b5ba3df9c1fa530bb0b11aa7d9 (diff)
downloadotp-a2ca3b6efd40d0f313d8dac1e7161f32182cd875.tar.gz
otp-a2ca3b6efd40d0f313d8dac1e7161f32182cd875.tar.bz2
otp-a2ca3b6efd40d0f313d8dac1e7161f32182cd875.zip
Merge branch 'lukas/erts/isfinite-fix/OTP-12268' into maint
* lukas/erts/isfinite-fix/OTP-12268: erts: Fix finite warning for clang
-rw-r--r--erts/emulator/sys/unix/erl_unix_sys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h
index f7a6298d5b..26ed2fb558 100644
--- a/erts/emulator/sys/unix/erl_unix_sys.h
+++ b/erts/emulator/sys/unix/erl_unix_sys.h
@@ -229,7 +229,7 @@ extern void sys_stop_cat(void);
#ifdef USE_ISINF_ISNAN /* simulate finite() */
# define isfinite(f) (!isinf(f) && !isnan(f))
# define HAVE_ISFINITE
-#elif defined(__GNUC__) && defined(HAVE_FINITE)
+#elif (defined(__GNUC__) && !defined(__llvm__)) && defined(HAVE_FINITE)
/* We use finite in gcc as it emits assembler instead of
the function call that isfinite emits. The assembler is
significantly faster. */