Skip to content

Commit f96e7fd

Browse files
paulmonzooba
paulmon
authored and
zooba
committed
bpo-36941: Windows build changes for Windows ARM64 (pythonGH-13365)
1 parent cab5d07 commit f96e7fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1029
-7
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ PCbuild/*.VC.opendb
7070
PCbuild/.vs/
7171
PCbuild/amd64/
7272
PCbuild/arm32/
73+
PCbuild/arm64/
7374
PCbuild/obj/
7475
PCbuild/win32/
7576
.purify

‎PCbuild/_asyncio.vcxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Debug|Win32">
913
<Configuration>Debug</Configuration>
1014
<Platform>Win32</Platform>
@@ -17,6 +21,10 @@
1721
<Configuration>PGInstrument</Configuration>
1822
<Platform>ARM</Platform>
1923
</ProjectConfiguration>
24+
<ProjectConfiguration Include="PGInstrument|ARM64">
25+
<Configuration>PGInstrument</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
2028
<ProjectConfiguration Include="PGInstrument|Win32">
2129
<Configuration>PGInstrument</Configuration>
2230
<Platform>Win32</Platform>
@@ -29,6 +37,10 @@
2937
<Configuration>PGUpdate</Configuration>
3038
<Platform>ARM</Platform>
3139
</ProjectConfiguration>
40+
<ProjectConfiguration Include="PGUpdate|ARM64">
41+
<Configuration>PGUpdate</Configuration>
42+
<Platform>ARM64</Platform>
43+
</ProjectConfiguration>
3244
<ProjectConfiguration Include="PGUpdate|Win32">
3345
<Configuration>PGUpdate</Configuration>
3446
<Platform>Win32</Platform>
@@ -41,6 +53,10 @@
4153
<Configuration>Release</Configuration>
4254
<Platform>ARM</Platform>
4355
</ProjectConfiguration>
56+
<ProjectConfiguration Include="Release|ARM64">
57+
<Configuration>Release</Configuration>
58+
<Platform>ARM64</Platform>
59+
</ProjectConfiguration>
4460
<ProjectConfiguration Include="Release|Win32">
4561
<Configuration>Release</Configuration>
4662
<Platform>Win32</Platform>

‎PCbuild/_bz2.vcxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Debug|Win32">
913
<Configuration>Debug</Configuration>
1014
<Platform>Win32</Platform>
@@ -17,6 +21,10 @@
1721
<Configuration>PGInstrument</Configuration>
1822
<Platform>ARM</Platform>
1923
</ProjectConfiguration>
24+
<ProjectConfiguration Include="PGInstrument|ARM64">
25+
<Configuration>PGInstrument</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
2028
<ProjectConfiguration Include="PGInstrument|Win32">
2129
<Configuration>PGInstrument</Configuration>
2230
<Platform>Win32</Platform>
@@ -29,6 +37,10 @@
2937
<Configuration>PGUpdate</Configuration>
3038
<Platform>ARM</Platform>
3139
</ProjectConfiguration>
40+
<ProjectConfiguration Include="PGUpdate|ARM64">
41+
<Configuration>PGUpdate</Configuration>
42+
<Platform>ARM64</Platform>
43+
</ProjectConfiguration>
3244
<ProjectConfiguration Include="PGUpdate|Win32">
3345
<Configuration>PGUpdate</Configuration>
3446
<Platform>Win32</Platform>
@@ -41,6 +53,10 @@
4153
<Configuration>Release</Configuration>
4254
<Platform>ARM</Platform>
4355
</ProjectConfiguration>
56+
<ProjectConfiguration Include="Release|ARM64">
57+
<Configuration>Release</Configuration>
58+
<Platform>ARM64</Platform>
59+
</ProjectConfiguration>
4460
<ProjectConfiguration Include="Release|Win32">
4561
<Configuration>Release</Configuration>
4662
<Platform>Win32</Platform>

‎PCbuild/_ctypes.vcxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Debug|Win32">
913
<Configuration>Debug</Configuration>
1014
<Platform>Win32</Platform>
@@ -17,6 +21,10 @@
1721
<Configuration>PGInstrument</Configuration>
1822
<Platform>ARM</Platform>
1923
</ProjectConfiguration>
24+
<ProjectConfiguration Include="PGInstrument|ARM64">
25+
<Configuration>PGInstrument</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
2028
<ProjectConfiguration Include="PGInstrument|Win32">
2129
<Configuration>PGInstrument</Configuration>
2230
<Platform>Win32</Platform>
@@ -29,6 +37,10 @@
2937
<Configuration>PGUpdate</Configuration>
3038
<Platform>ARM</Platform>
3139
</ProjectConfiguration>
40+
<ProjectConfiguration Include="PGUpdate|ARM64">
41+
<Configuration>PGUpdate</Configuration>
42+
<Platform>ARM64</Platform>
43+
</ProjectConfiguration>
3244
<ProjectConfiguration Include="PGUpdate|Win32">
3345
<Configuration>PGUpdate</Configuration>
3446
<Platform>Win32</Platform>
@@ -41,6 +53,10 @@
4153
<Configuration>Release</Configuration>
4254
<Platform>ARM</Platform>
4355
</ProjectConfiguration>
56+
<ProjectConfiguration Include="Release|ARM64">
57+
<Configuration>Release</Configuration>
58+
<Platform>ARM64</Platform>
59+
</ProjectConfiguration>
4460
<ProjectConfiguration Include="Release|Win32">
4561
<Configuration>Release</Configuration>
4662
<Platform>Win32</Platform>

‎PCbuild/_ctypes_test.vcxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Debug|Win32">
913
<Configuration>Debug</Configuration>
1014
<Platform>Win32</Platform>
@@ -17,6 +21,10 @@
1721
<Configuration>PGInstrument</Configuration>
1822
<Platform>ARM</Platform>
1923
</ProjectConfiguration>
24+
<ProjectConfiguration Include="PGInstrument|ARM64">
25+
<Configuration>PGInstrument</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
2028
<ProjectConfiguration Include="PGInstrument|Win32">
2129
<Configuration>PGInstrument</Configuration>
2230
<Platform>Win32</Platform>
@@ -29,6 +37,10 @@
2937
<Configuration>PGUpdate</Configuration>
3038
<Platform>ARM</Platform>
3139
</ProjectConfiguration>
40+
<ProjectConfiguration Include="PGUpdate|ARM64">
41+
<Configuration>PGUpdate</Configuration>
42+
<Platform>ARM64</Platform>
43+
</ProjectConfiguration>
3244
<ProjectConfiguration Include="PGUpdate|Win32">
3345
<Configuration>PGUpdate</Configuration>
3446
<Platform>Win32</Platform>
@@ -41,6 +53,10 @@
4153
<Configuration>Release</Configuration>
4254
<Platform>ARM</Platform>
4355
</ProjectConfiguration>
56+
<ProjectConfiguration Include="Release|ARM64">
57+
<Configuration>Release</Configuration>
58+
<Platform>ARM64</Platform>
59+
</ProjectConfiguration>
4460
<ProjectConfiguration Include="Release|Win32">
4561
<Configuration>Release</Configuration>
4662
<Platform>Win32</Platform>

‎PCbuild/_decimal.vcxproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Debug|Win32">
913
<Configuration>Debug</Configuration>
1014
<Platform>Win32</Platform>
@@ -17,6 +21,10 @@
1721
<Configuration>PGInstrument</Configuration>
1822
<Platform>ARM</Platform>
1923
</ProjectConfiguration>
24+
<ProjectConfiguration Include="PGInstrument|ARM64">
25+
<Configuration>PGInstrument</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
2028
<ProjectConfiguration Include="PGInstrument|Win32">
2129
<Configuration>PGInstrument</Configuration>
2230
<Platform>Win32</Platform>
@@ -29,6 +37,10 @@
2937
<Configuration>PGUpdate</Configuration>
3038
<Platform>ARM</Platform>
3139
</ProjectConfiguration>
40+
<ProjectConfiguration Include="PGUpdate|ARM64">
41+
<Configuration>PGUpdate</Configuration>
42+
<Platform>ARM64</Platform>
43+
</ProjectConfiguration>
3244
<ProjectConfiguration Include="PGUpdate|Win32">
3345
<Configuration>PGUpdate</Configuration>
3446
<Platform>Win32</Platform>
@@ -41,6 +53,10 @@
4153
<Configuration>Release</Configuration>
4254
<Platform>ARM</Platform>
4355
</ProjectConfiguration>
56+
<ProjectConfiguration Include="Release|ARM64">
57+
<Configuration>Release</Configuration>
58+
<Platform>ARM64</Platform>
59+
</ProjectConfiguration>
4460
<ProjectConfiguration Include="Release|Win32">
4561
<Configuration>Release</Configuration>
4662
<Platform>Win32</Platform>
@@ -80,6 +96,7 @@
8096
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8197
<PreprocessorDefinitions Condition="'$(Platform)' == 'Win32'">CONFIG_32;PPRO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8298
<PreprocessorDefinitions Condition="'$(Platform)'=='ARM'">CONFIG_32;ANSI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
99+
<PreprocessorDefinitions Condition="'$(Platform)'=='ARM64'">CONFIG_64;ANSI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
83100
<PreprocessorDefinitions Condition="'$(Platform)' == 'x64'">CONFIG_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
84101
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
85102
</ClCompile>
@@ -124,6 +141,7 @@
124141
<CustomBuild Include="..\Modules\_decimal\libmpdec\vcdiv64.asm">
125142
<ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
126143
<ExcludedFromBuild Condition="'$(Platform)'=='ARM'">true</ExcludedFromBuild>
144+
<ExcludedFromBuild Condition="'$(Platform)'=='ARM64'">true</ExcludedFromBuild>
127145
<Command>ml64 /nologo /c /Zi /Fo "$(IntDir)vcdiv64.obj" "%(FullPath)"</Command>
128146
<Outputs>$(IntDir)vcdiv64.obj;%(Outputs)</Outputs>
129147
</CustomBuild>

‎PCbuild/_elementtree.vcxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Debug|Win32">
913
<Configuration>Debug</Configuration>
1014
<Platform>Win32</Platform>
@@ -17,6 +21,10 @@
1721
<Configuration>PGInstrument</Configuration>
1822
<Platform>ARM</Platform>
1923
</ProjectConfiguration>
24+
<ProjectConfiguration Include="PGInstrument|ARM64">
25+
<Configuration>PGInstrument</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
2028
<ProjectConfiguration Include="PGInstrument|Win32">
2129
<Configuration>PGInstrument</Configuration>
2230
<Platform>Win32</Platform>
@@ -29,6 +37,10 @@
2937
<Configuration>PGUpdate</Configuration>
3038
<Platform>ARM</Platform>
3139
</ProjectConfiguration>
40+
<ProjectConfiguration Include="PGUpdate|ARM64">
41+
<Configuration>PGUpdate</Configuration>
42+
<Platform>ARM64</Platform>
43+
</ProjectConfiguration>
3244
<ProjectConfiguration Include="PGUpdate|Win32">
3345
<Configuration>PGUpdate</Configuration>
3446
<Platform>Win32</Platform>
@@ -41,6 +53,10 @@
4153
<Configuration>Release</Configuration>
4254
<Platform>ARM</Platform>
4355
</ProjectConfiguration>
56+
<ProjectConfiguration Include="Release|ARM64">
57+
<Configuration>Release</Configuration>
58+
<Platform>ARM64</Platform>
59+
</ProjectConfiguration>
4460
<ProjectConfiguration Include="Release|Win32">
4561
<Configuration>Release</Configuration>
4662
<Platform>Win32</Platform>

‎PCbuild/_freeze_importlib.vcxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Debug|Win32">
913
<Configuration>Debug</Configuration>
1014
<Platform>Win32</Platform>
@@ -17,6 +21,10 @@
1721
<Configuration>PGInstrument</Configuration>
1822
<Platform>ARM</Platform>
1923
</ProjectConfiguration>
24+
<ProjectConfiguration Include="PGInstrument|ARM64">
25+
<Configuration>PGInstrument</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
2028
<ProjectConfiguration Include="PGInstrument|Win32">
2129
<Configuration>PGInstrument</Configuration>
2230
<Platform>Win32</Platform>
@@ -29,6 +37,10 @@
2937
<Configuration>PGUpdate</Configuration>
3038
<Platform>ARM</Platform>
3139
</ProjectConfiguration>
40+
<ProjectConfiguration Include="PGUpdate|ARM64">
41+
<Configuration>PGUpdate</Configuration>
42+
<Platform>ARM64</Platform>
43+
</ProjectConfiguration>
3244
<ProjectConfiguration Include="PGUpdate|Win32">
3345
<Configuration>PGUpdate</Configuration>
3446
<Platform>Win32</Platform>
@@ -41,6 +53,10 @@
4153
<Configuration>Release</Configuration>
4254
<Platform>ARM</Platform>
4355
</ProjectConfiguration>
56+
<ProjectConfiguration Include="Release|ARM64">
57+
<Configuration>Release</Configuration>
58+
<Platform>ARM64</Platform>
59+
</ProjectConfiguration>
4460
<ProjectConfiguration Include="Release|Win32">
4561
<Configuration>Release</Configuration>
4662
<Platform>Win32</Platform>

‎PCbuild/_hashlib.vcxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Debug|Win32">
913
<Configuration>Debug</Configuration>
1014
<Platform>Win32</Platform>
@@ -17,6 +21,10 @@
1721
<Configuration>PGInstrument</Configuration>
1822
<Platform>ARM</Platform>
1923
</ProjectConfiguration>
24+
<ProjectConfiguration Include="PGInstrument|ARM64">
25+
<Configuration>PGInstrument</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
2028
<ProjectConfiguration Include="PGInstrument|Win32">
2129
<Configuration>PGInstrument</Configuration>
2230
<Platform>Win32</Platform>
@@ -29,6 +37,10 @@
2937
<Configuration>PGUpdate</Configuration>
3038
<Platform>ARM</Platform>
3139
</ProjectConfiguration>
40+
<ProjectConfiguration Include="PGUpdate|ARM64">
41+
<Configuration>PGUpdate</Configuration>
42+
<Platform>ARM64</Platform>
43+
</ProjectConfiguration>
3244
<ProjectConfiguration Include="PGUpdate|Win32">
3345
<Configuration>PGUpdate</Configuration>
3446
<Platform>Win32</Platform>
@@ -41,6 +53,10 @@
4153
<Configuration>Release</Configuration>
4254
<Platform>ARM</Platform>
4355
</ProjectConfiguration>
56+
<ProjectConfiguration Include="Release|ARM64">
57+
<Configuration>Release</Configuration>
58+
<Platform>ARM64</Platform>
59+
</ProjectConfiguration>
4460
<ProjectConfiguration Include="Release|Win32">
4561
<Configuration>Release</Configuration>
4662
<Platform>Win32</Platform>

0 commit comments

Comments
 (0)