Merge pull request #28237 from charris/backport-28235 · numpy/numpy@a6aefba · GitHub

numpy / numpy Public

• Notifications You must be signed in to change notification settings
• Fork 12.8k
• Star 32.8k

• Code
• Issues 2k
• Pull requests 301
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit a6aefba

Browse filesBrowse the repository at this point in the historyBrowse files

charris

authored

Merge pull request #28237 from charris/backport-28235

BLD: Compile fix for clang-cl on WoA

2 parents 35376e5 + 3e9d196 commit a6aefba
Copy full SHA for a6aefba

1 file changed

+2-1Lines changed: 2 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• numpy/_core/src/multiarray
  • _multiarray_tests.c.src

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎numpy/_core/src/multiarray/_multiarray_tests.c.src‎

Copy file name to clipboardExpand all lines: numpy/_core/src/multiarray/_multiarray_tests.c.src

+2-1Lines changed: 2 additions & 1 deletion

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));

0 commit comments

Comments

0 (0)