changeset:   97491:c1523d5dee3c
branch:      3.5
parent:      97477:7382e5fe3a40
parent:      97490:d93bb3d636cf
user:        Larry Hastings <larry@hastings.org>
date:        Mon Aug 24 16:44:44 2015 -0700
description:
Merged in bitdancer/cpython350 (pull request #4)

#21167: Fix definition of NAN when ICC used without -fp-model strict.


diff -r 7382e5fe3a40 -r c1523d5dee3c Include/pymath.h
--- a/Include/pymath.h	Mon Aug 24 12:49:22 2015 -0700
+++ b/Include/pymath.h	Mon Aug 24 16:44:44 2015 -0700
@@ -150,7 +150,29 @@
  * doesn't support NaNs.
  */
 #if !defined(Py_NAN) && !defined(Py_NO_NAN)
-#define Py_NAN (Py_HUGE_VAL * 0.)
+#if !defined(__INTEL_COMPILER)
+    #define Py_NAN (Py_HUGE_VAL * 0.)
+#else /* __INTEL_COMPILER */
+    #if defined(ICC_NAN_STRICT)
+        #pragma float_control(push)
+        #pragma float_control(precise, on)
+        #pragma float_control(except,  on)
+        #if defined(_MSC_VER)
+            __declspec(noinline)
+        #else /* Linux */
+            __attribute__((noinline))
+        #endif /* _MSC_VER */
+        static double __icc_nan()
+        {
+            return sqrt(-1.0);
+        }
+        #pragma float_control (pop)
+        #define Py_NAN __icc_nan()
+    #else /* ICC_NAN_RELAXED as default for Intel Compiler */
+        static union { unsigned char buf[8]; double __icc_nan; } __nan_store = {0,0,0,0,0,0,0xf8,0x7f};
+        #define Py_NAN (__nan_store.__icc_nan)
+    #endif /* ICC_NAN_STRICT */
+#endif /* __INTEL_COMPILER */
 #endif
 
 /* Py_OVERFLOWED(X)
diff -r 7382e5fe3a40 -r c1523d5dee3c Misc/ACKS
--- a/Misc/ACKS	Mon Aug 24 12:49:22 2015 -0700
+++ b/Misc/ACKS	Mon Aug 24 16:44:44 2015 -0700
@@ -594,6 +594,7 @@
 Chris Hoffman
 Stefan Hoffmeister
 Albert Hofkamp
+Chris Hogan
 Tomas Hoger
 Jonathan Hogg
 Kamilla Holanda
diff -r 7382e5fe3a40 -r c1523d5dee3c Misc/NEWS
--- a/Misc/NEWS	Mon Aug 24 12:49:22 2015 -0700
+++ b/Misc/NEWS	Mon Aug 24 16:44:44 2015 -0700
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #21167: NAN operations are now handled correctly when python is
+  compiled with ICC even if -fp-model strict is not specified.
+
 Library
 -------