Skip to content

bpo-35758: Fix building on ARM + MSVC #11531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pitrou merged 5 commits into from
Jan 21, 2019
Merged

bpo-35758: Fix building on ARM + MSVC #11531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8bcddd
Disable x87 control word for non-x86 targets
gongminmin Jan 12, 2019
a1eee95
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 21, 2019
b180407
Include immintrin.h on x86 and x64 only
gongminmin Jan 21, 2019
5d3e88c
Update NEWS according to PR contents
pitrou Jan 21, 2019
d1adcb3
Force CI checks to run
pitrou Jan 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Include/internal/pycore_atomic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ extern "C" {

#if defined(_MSC_VER)
#include <intrin.h>
#include <immintrin.h>
#if defined(_M_IX86) || defined(_M_X64)
# include <immintrin.h>
#endif
#endif

/* This is modeled after the atomics interface from C1x, according to
Expand Down
2 changes: 1 addition & 1 deletion Include/pyport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ extern "C" {
#endif

/* get and set x87 control word for VisualStudio/x86 */
#if defined(_MSC_VER) && !defined(_WIN64) /* x87 not supported in 64-bit */
#if defined(_MSC_VER) && defined(_M_IX86) /* x87 only supported in x86 */
#define HAVE_PY_SET_53BIT_PRECISION 1
#define _Py_SET_53BIT_PRECISION_HEADER \
unsigned int old_387controlword, new_387controlword, out_387controlword
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2019-01-21-05-18-14.bpo-35758.8LsY3l.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow building on ARM with MSVC.