FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-42405: fix C extensions build on Windows ARM64 by ader1990 · Pull Request #23399 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

bpo-42405: fix C extensions build on Windows ARM64 #23399

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
miss-islington merged 2 commits into from
Mar 4, 2021
+23 −1
Conversation 8 Commits 2 Checks 0 Files changed 2
Merged

bpo-42405: fix C extensions build on Windows ARM64 #23399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a759ba
bpo-42405: fix C extensions build on Windows ARM64
ader1990 Oct 1, 2020
fe06ebe
Add a bit of detail to the changelog.
jaraco Mar 4, 2021
File filter

Filter by extension

Filter by extension .py  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
23 changes: 22 additions & 1 deletion Lib/distutils/msvc9compiler.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
PLAT_TO_VCVARS = {
'win32' : 'x86',
'win-amd64' : 'amd64',
'win-arm64' : 'arm64',
}

class Reg:
Expand Down Expand Up @@ -342,7 +343,7 @@ def initialize(self, plat_name=None):
if plat_name is None:
plat_name = get_platform()
# sanity check for platforms to prevent obscure errors later.
ok_plats = 'win32', 'win-amd64'
ok_plats = 'win32', 'win-amd64', 'win-arm64'
if plat_name not in ok_plats:
raise DistutilsPlatformError("--plat-name must be one of %s" %
(ok_plats,))
Expand Down Expand Up @@ -371,6 +372,9 @@ def initialize(self, plat_name=None):
vc_env = query_vcvarsall(VERSION, plat_spec)

self.__paths = vc_env['path'].split(os.pathsep)
if plat_name == 'win-arm64':
self.__paths = (
vc_env['path'].replace('HostX64', 'HostX86').split(os.pathsep))
os.environ['lib'] = vc_env['lib']
os.environ['include'] = vc_env['include']

Expand All @@ -385,6 +389,12 @@ def initialize(self, plat_name=None):
self.lib = self.find_exe("lib.exe")
self.rc = self.find_exe("rc.exe") # resource compiler
self.mc = self.find_exe("mc.exe") # message compiler
if plat_name == 'win-arm64':
self.cc = self.cc.replace('HostX64', 'Hostx86')
self.linker = self.linker.replace('HostX64', 'Hostx86')
self.lib = self.lib.replace('HostX64', 'Hostx86')
self.rc = self.rc.replace('x64', 'arm64')
self.mc = self.mc.replace('x64', 'arm64')
#self.set_path_env_var('lib')
#self.set_path_env_var('include')

Expand Down Expand Up @@ -634,6 +644,17 @@ def link(self,
if extra_postargs:
ld_args.extend(extra_postargs)

if get_platform() == 'win-arm64':
ld_args_arm = []
for ld_arg in ld_args:
# VS tries to use the x86 linker
ld_arg_arm = ld_arg.replace(r'\um\x86', r'\um\arm64')
# A larger memory address is required on ARM64
ld_arg_arm = ld_arg_arm.replace("0x1", "0x10")
ld_args_arm += [ld_arg_arm]

ld_args = list(ld_args_arm)

self.mkpath(os.path.dirname(output_filename))
try:
self.spawn([self.linker] + ld_args)
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2020-11-23-10-14-03.bpo-42405.4vQUja.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
In distutils, add support for building C extensions on Windows ARM64.
Back | FazBrowse Home | New Git URL