Merge pull request #28246 from matthew-brett/clang-cl-better-fix

charris · web-flow · commit 4cffb9dbd5f1 · 2025-01-29T09:08:00.000-07:00
BLD: better fix for clang / ARM compiles
diff --git a/numpy/_core/src/multiarray/_multiarray_tests.c.src b/numpy/_core/src/multiarray/_multiarray_tests.c.src
@@ -1878,7 +1878,8 @@ get_fpu_mode(PyObject *NPY_UNUSED(self), PyObject *args)
         return PyLong_FromLongLong(result);
     }
 #elif (defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))) \
-  || (defined(_MSC_VER) && defined(__clang__) && !defined(__ARM_ARCH))
+  || (defined(_MSC_VER) && defined(__clang__) && \
+      (defined(_M_IX86) || defined(_M_AMD64)))
     {
         unsigned short cw = 0;
         __asm__("fstcw %w0" : "=m" (cw));

Original file line number	Diff line number	Diff line change
`@@ -1878,7 +1878,8 @@ get_fpu_mode(PyObject NPY_UNUSED(self), PyObject args)`
`1878`	`1878`	`return PyLong_FromLongLong(result);`
`1879`	`1879`	`}`
`1880`	`1880`	`#elif (defined(__GNUC__) && (defined(__x86_64__) \|\| defined(__i386__))) \`
`1881`		`- \|\| (defined(_MSC_VER) && defined(__clang__) && !defined(__ARM_ARCH))`
	`1881`	`+ \|\| (defined(_MSC_VER) && defined(__clang__) && \`
	`1882`	`+ (defined(_M_IX86) \|\| defined(_M_AMD64)))`
`1882`	`1883`	`{`
`1883`	`1884`	`unsigned short cw = 0;`
`1884`	`1885`	`__asm__("fstcw %w0" : "=m" (cw));`