Merge pull request #28237 from charris/backport-28235

charris · web-flow · commit a6aefba26dab · 2025-01-27T13:14:16.000-07:00
BLD: Compile fix for clang-cl on WoA
diff --git a/numpy/_core/src/multiarray/_multiarray_tests.c.src b/numpy/_core/src/multiarray/_multiarray_tests.c.src
@@ -1877,7 +1877,8 @@ get_fpu_mode(PyObject *NPY_UNUSED(self), PyObject *args)
         result = _controlfp(0, 0);
         return PyLong_FromLongLong(result);
     }
-#elif (defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))) || (defined(_MSC_VER) && defined(__clang__))
+#elif (defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))) \
+  || (defined(_MSC_VER) && defined(__clang__) && !defined(__ARM_ARCH))
     {
         unsigned short cw = 0;
         __asm__("fstcw %w0" : "=m" (cw));

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