Skip to content

Commit 418aa8a

Browse files
authored
Delete Windows arm32 support (dotnet#86065)
1 parent 0b5f137 commit 418aa8a

32 files changed

+21
-3084
lines changed

.vsconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"Microsoft.VisualStudio.Component.VC.CMake.Project",
4242
"Microsoft.VisualStudio.Component.VC.CoreIde",
4343
"Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
44-
"Microsoft.VisualStudio.Component.VC.Tools.ARM",
4544
"Microsoft.VisualStudio.Component.VC.Tools.ARM64",
4645
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
4746
"Microsoft.VisualStudio.Component.Windows10SDK.19041",

docs/infra/test-configurations.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ All builds are
2929
- Windows 10 x64 Client VS2019
3030
- x64 Release
3131
- x86 Release
32-
- arm32 Release
3332
- arm64 Release
3433
- Ubuntu 18.04 x64
3534
- Linux x64 Release

docs/workflow/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ The repo can be built for the following platforms, using the provided setup and
1717
| :---- | :------: | :------: | :------: | :------: |
1818
| x64 | ✔ | ✔ | ✔ | ✔ |
1919
| x86 | ✔ | | | |
20-
| ARM | ✔ | ✔ | | |
21-
| ARM64 | ✔ | ✔ | ✔ | |
20+
| Arm32 | | ✔ | | |
21+
| Arm64 | ✔ | ✔ | ✔ | |
2222
| | [Requirements](requirements/windows-requirements.md) | [Requirements](requirements/linux-requirements.md) | [Requirements](requirements/macos-requirements.md) | [Requirements](requirements/freebsd-requirements.md)
2323

2424
Additionally, keep in mind that cloning the full history of this repo takes roughly 400-500 MB of network transfer, inflating to a repository that can consume somewhere between 1 to 1.5 GB. A build of the repo can take somewhere between 10 and 20 GB of space for a single OS and Platform configuration depending on the portions of the product built. This might increase over time, so consider this to be a minimum bar for working with this codebase.

docs/workflow/building/coreclr/cross-building.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Cross-Building for Different Architectures and Operating Systems
22

33
* [Windows Cross-Building](#windows-cross-building)
4-
* [Cross-Compiling for ARM32 and ARM64 on Windows](#cross-compiling-for-arm32-and-arm64-on-windows)
4+
* [Cross-Compiling for ARM64 on Windows](#cross-compiling-for-arm64-on-windows)
55
* [Cross-Compiling for x86 on Windows](#cross-compiling-for-x86-on-windows)
66
* [macOS Cross-Building](#macos-cross-building)
77
* [Linux Cross-Building](#linux-cross-building)
@@ -21,9 +21,9 @@ This guide will go more in-depth on how to do cross-building across multiple ope
2121

2222
This section will go over cross-compiling on Windows. Currently, Windows allows you to cross-compile from x64 to basically any other architecture.
2323

24-
### Cross-Compiling for ARM32 and ARM64 on Windows
24+
### Cross-Compiling for ARM64 on Windows
2525

26-
To do cross-compilation for ARM32/ARM64 on Windows, first make sure you have the appropriate tools and Windows SDK installed. This is described in detail in the [Windows requirements doc](/docs/workflow/requirements/windows-requirements.md#visual-studio).
26+
To do cross-compilation for ARM64 on Windows, first make sure you have the appropriate tools and Windows SDK installed. This is described in detail in the [Windows requirements doc](/docs/workflow/requirements/windows-requirements.md#visual-studio).
2727

2828
Once you have all the required dependencies, it is a straightforward process. Windows knows how to cross-build behind curtains, so all you have to do is specify which architecture you want to build for:
2929

docs/workflow/requirements/windows-requirements.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ Install [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/). The
3535
* It's recommended to use **Workloads** installation approach. The following are the minimum requirements:
3636
* **.NET Desktop Development** with all default components,
3737
* **Desktop Development with C++** with all default components.
38-
* To build for Arm32 or Arm64, make sure that you have the right architecture-specific compilers installed. In the **Individual components** window, in the **Compilers, build tools, and runtimes** section:
39-
* For Arm32, check the box for _MSVC v143* VS 2022 C++ ARM build tools (Latest)_.
38+
* To build for Arm64, make sure that you have the right architecture-specific compilers installed. In the **Individual components** window, in the **Compilers, build tools, and runtimes** section:
4039
* For Arm64, check the box for _MSVC v143* VS 2022 C++ ARM64 build tools (Latest)_.
4140
* To build the tests, you will need some additional components:
4241
* **C++/CLI support for v142 build tools (Latest)**.

eng/Subsets.props

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -267,19 +267,6 @@
267267
Category="clr" />
268268
</ItemGroup>
269269

270-
<ItemGroup Condition="(('$(ClrRuntimeBuildSubsets)' != '' and '$(PrimaryRuntimeFlavor)' == 'CoreCLR' and '$(TargetsMobile)' != 'true') or $(_subset.Contains('+clr.crossarchtools+'))) and $([MSBuild]::IsOsPlatform(Windows)) and '$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' == 'x64'">
271-
<ProjectToBuild
272-
Include="$(CoreClrProjectRoot)runtime.proj"
273-
AdditionalProperties="%(AdditionalProperties);
274-
ClrCrossComponentsSubset=true;
275-
HostArchitecture=x86;
276-
PgoInstrument=false;
277-
NoPgoOptimize=true;
278-
CrossBuild=false;
279-
CMakeArgs=$(CMakeArgs) -DCLR_CROSS_COMPONENTS_BUILD=1"
280-
Category="clr" />
281-
</ItemGroup>
282-
283270
<ItemGroup Condition="$(_subset.Contains('+clr.paltestlist+'))">
284271
<ProjectToBuild Include="$(CoreClrProjectRoot)pal/tests/palsuite/producepaltestlist.proj" />
285272
</ItemGroup>

eng/pipelines/mono/templates/workloads-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ jobs:
7272
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.WebAssembly.Sdk*.nupkg
7373
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.WebAssembly.Wasi*.nupkg
7474
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.WebAssembly.Templates*.nupkg
75-
IntermediateArtifacts/windows_arm/Shipping/Microsoft.NETCore.App.Runtime.win-arm*.nupkg
7675
IntermediateArtifacts/windows_arm64/Shipping/Microsoft.NETCore.App.Runtime.win-arm64*.nupkg
7776
IntermediateArtifacts/windows_x64/Shipping/Microsoft.NETCore.App.Runtime.win-x64*.nupkg
7877
IntermediateArtifacts/windows_x86/Shipping/Microsoft.NETCore.App.Runtime.win-x86*.nupkg

src/coreclr/CMakeSettings.json

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,6 @@
5050
"ctestCommandArgs": "",
5151
"inheritEnvironments": [ "msvc_x86" ]
5252
},
53-
{
54-
"name": "windows.arm.Debug",
55-
"generator": "Ninja",
56-
"configurationType": "Debug",
57-
"buildRoot": "${env.artifactsObj}\\${name}",
58-
"installRoot": "${env.artifactsBin}\\${name}",
59-
"cmakeCommandArgs": "-DCLR_CMAKE_HOST_ARCH=arm",
60-
"buildCommandArgs": "",
61-
"ctestCommandArgs": "",
62-
"inheritEnvironments": [ "msvc_arm" ]
63-
},
64-
{
65-
"name": "windows.arm.Release",
66-
"generator": "Ninja",
67-
"configurationType": "Release",
68-
"buildRoot": "${env.artifactsObj}\\${name}",
69-
"installRoot": "${env.artifactsBin}\\${name}",
70-
"cmakeCommandArgs": "-DCLR_CMAKE_HOST_ARCH=arm",
71-
"buildCommandArgs": "",
72-
"ctestCommandArgs": "",
73-
"inheritEnvironments": [ "msvc_arm" ],
74-
"variables": []
75-
},
7653
{
7754
"name": "windows.arm64.Debug",
7855
"generator": "Ninja",
@@ -98,4 +75,4 @@
9875
"variables": []
9976
}
10077
]
101-
}
78+
}

src/coreclr/build-runtime.cmd

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ set __BuildAll=
4242

4343
set __TargetArchX64=0
4444
set __TargetArchX86=0
45-
set __TargetArchArm=0
4645
set __TargetArchArm64=0
4746

4847
set __BuildTypeDebug=0
@@ -87,7 +86,6 @@ if /i "%1" == "--help" goto Usage
8786
if /i "%1" == "-all" (set __BuildAll=1&shift&goto Arg_Loop)
8887
if /i "%1" == "-x64" (set __TargetArchX64=1&shift&goto Arg_Loop)
8988
if /i "%1" == "-x86" (set __TargetArchX86=1&shift&goto Arg_Loop)
90-
if /i "%1" == "-arm" (set __TargetArchArm=1&shift&goto Arg_Loop)
9189
if /i "%1" == "-arm64" (set __TargetArchArm64=1&shift&goto Arg_Loop)
9290

9391
if /i "%1" == "-debug" (set __BuildTypeDebug=1&shift&goto Arg_Loop)
@@ -101,7 +99,6 @@ REM don't add more, use the - syntax instead
10199
if /i "%1" == "all" (set __BuildAll=1&shift&goto Arg_Loop)
102100
if /i "%1" == "x64" (set __TargetArchX64=1&shift&goto Arg_Loop)
103101
if /i "%1" == "x86" (set __TargetArchX86=1&shift&goto Arg_Loop)
104-
if /i "%1" == "arm" (set __TargetArchArm=1&shift&goto Arg_Loop)
105102
if /i "%1" == "arm64" (set __TargetArchArm64=1&shift&goto Arg_Loop)
106103

107104
if /i "%1" == "debug" (set __BuildTypeDebug=1&shift&goto Arg_Loop)
@@ -165,7 +162,7 @@ if defined VCINSTALLDIR (
165162

166163
if defined __BuildAll goto BuildAll
167164

168-
set /A __TotalSpecifiedTargetArch=__TargetArchX64 + __TargetArchX86 + __TargetArchArm + __TargetArchArm64
165+
set /A __TotalSpecifiedTargetArch=__TargetArchX64 + __TargetArchX86 + __TargetArchArm64
169166
if %__TotalSpecifiedTargetArch% GTR 1 (
170167
echo Error: more than one build architecture specified, but "all" not specified.
171168
goto Usage
@@ -176,7 +173,6 @@ if "%__ProcessorArch%"=="" set __ProcessorArch=%PROCESSOR_ARCHITECTURE%
176173

177174
if %__TargetArchX64%==1 set __TargetArch=x64
178175
if %__TargetArchX86%==1 set __TargetArch=x86
179-
if %__TargetArchArm%==1 set __TargetArch=arm
180176
if %__TargetArchArm64%==1 set __TargetArch=arm64
181177
if "%__HostArch%" == "" set __HostArch=%__TargetArch%
182178

@@ -191,10 +187,6 @@ if %__BuildTypeChecked%==1 set __BuildType=Checked
191187
if %__BuildTypeRelease%==1 set __BuildType=Release
192188

193189
if %__EnforcePgo%==1 (
194-
if %__TargetArchArm%==1 (
195-
echo NOTICE: enforcepgo does nothing on arm architecture
196-
set __EnforcePgo=0
197-
)
198190
if %__TargetArchArm64%==1 (
199191
echo NOTICE: enforcepgo does nothing on arm64 architecture
200192
set __EnforcePgo=0
@@ -451,7 +443,7 @@ REM ============================================================================
451443

452444
set __TargetArchList=
453445

454-
set /A __TotalSpecifiedTargetArch=__TargetArchX64 + __TargetArchX86 + __TargetArchArm + __TargetArchArm64
446+
set /A __TotalSpecifiedTargetArch=__TargetArchX64 + __TargetArchX86 + __TargetArchArm64
455447
if %__TotalSpecifiedTargetArch% EQU 0 (
456448
REM Nothing specified means we want to build all architectures.
457449
set __TargetArchList=x64 x86 arm arm64
@@ -461,7 +453,6 @@ REM Otherwise, add all the specified architectures to the list.
461453

462454
if %__TargetArchX64%==1 set __TargetArchList=%__TargetArchList% x64
463455
if %__TargetArchX86%==1 set __TargetArchList=%__TargetArchList% x86
464-
if %__TargetArchArm%==1 set __TargetArchList=%__TargetArchList% arm
465456
if %__TargetArchArm64%==1 set __TargetArchList=%__TargetArchList% arm64
466457

467458
set __BuildTypeList=
@@ -545,7 +536,7 @@ echo All arguments are optional. The options are:
545536
echo.
546537
echo.-? -h -help --help: view this message.
547538
echo -all: Builds all configurations and platforms.
548-
echo Build architecture: one of -x64, -x86, -arm, -arm64 ^(default: -x64^).
539+
echo Build architecture: one of -x64, -x86, -arm64 ^(default: -x64^).
549540
echo Build type: one of -Debug, -Checked, -Release ^(default: -Debug^).
550541
echo -component ^<name^> : specify this option one or more times to limit components built to those specified.
551542
echo Allowed ^<name^>: hosts jit alljits runtime paltests iltools nativeaot spmi

src/coreclr/debug/di/arm/floatconversion.asm

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)