Skip to content

Commit 7ad0cc3

Browse files
targostargos
authoredMay 30, 2024··
build: remove support for 32-bit Windows
Closes: #42543 PR-URL: #53184 Fixes: #42543 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io> Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
·
v23.11.0v23.0.0
1 parent 9f6c124 commit 7ad0cc3

File tree

12 files changed

+34
-173
lines changed

12 files changed

+34
-173
lines changed
 

Diff for: ‎BUILDING.md

+21-27
Original file line numberDiff line numberDiff line change
@@ -100,26 +100,25 @@ Node.js does not support a platform version if a vendor has expired support
100100
for it. In other words, Node.js does not support running on End-of-Life (EoL)
101101
platforms. This is true regardless of entries in the table below.
102102

103-
| Operating System | Architectures | Versions | Support Type | Notes |
104-
| ---------------- | ---------------- | --------------------------------- | ----------------------------------------------- | ------------------------------------ |
105-
| GNU/Linux | x64 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 1 | e.g. Ubuntu 20.04, Debian 10, RHEL 8 |
106-
| GNU/Linux | x64 | kernel >= 3.10, musl >= 1.1.19 | Experimental | e.g. Alpine 3.8 |
107-
| GNU/Linux | x86 | kernel >= 3.10, glibc >= 2.17 | Experimental | Downgraded as of Node.js 10 |
108-
| GNU/Linux | arm64 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 1 | e.g. Ubuntu 20.04, Debian 10, RHEL 8 |
109-
| GNU/Linux | armv7 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 1 | e.g. Ubuntu 20.04, Debian 11 |
110-
| GNU/Linux | armv6 | kernel >= 4.14, glibc >= 2.24 | Experimental | Downgraded as of Node.js 12 |
111-
| GNU/Linux | ppc64le >=power8 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 2 | e.g. Ubuntu 20.04, RHEL 8 |
112-
| GNU/Linux | s390x | kernel >= 4.18[^1], glibc >= 2.28 | Tier 2 | e.g. RHEL 8 |
113-
| GNU/Linux | loong64 | kernel >= 5.19, glibc >= 2.36 | Experimental | |
114-
| Windows | x64, x86 (WoW64) | >= Windows 10/Server 2016 | Tier 1 | [^2],[^3] |
115-
| Windows | x86 (native) | >= Windows 10/Server 2016 | Tier 1 (running) / Experimental (compiling)[^4] | |
116-
| Windows | x64, x86 | Windows 8.1/Server 2012 | Experimental | |
117-
| Windows | arm64 | >= Windows 10 | Tier 2 | |
118-
| macOS | x64 | >= 11.0 | Tier 1 | For notes about compilation see [^5] |
119-
| macOS | arm64 | >= 11.0 | Tier 1 | |
120-
| SmartOS | x64 | >= 18 | Tier 2 | |
121-
| AIX | ppc64be >=power8 | >= 7.2 TL04 | Tier 2 | |
122-
| FreeBSD | x64 | >= 13.2 | Experimental | |
103+
| Operating System | Architectures | Versions | Support Type | Notes |
104+
| ---------------- | ---------------- | --------------------------------- | ------------ | ------------------------------------ |
105+
| GNU/Linux | x64 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 1 | e.g. Ubuntu 20.04, Debian 10, RHEL 8 |
106+
| GNU/Linux | x64 | kernel >= 3.10, musl >= 1.1.19 | Experimental | e.g. Alpine 3.8 |
107+
| GNU/Linux | x86 | kernel >= 3.10, glibc >= 2.17 | Experimental | Downgraded as of Node.js 10 |
108+
| GNU/Linux | arm64 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 1 | e.g. Ubuntu 20.04, Debian 10, RHEL 8 |
109+
| GNU/Linux | armv7 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 1 | e.g. Ubuntu 20.04, Debian 11 |
110+
| GNU/Linux | armv6 | kernel >= 4.14, glibc >= 2.24 | Experimental | Downgraded as of Node.js 12 |
111+
| GNU/Linux | ppc64le >=power8 | kernel >= 4.18[^1], glibc >= 2.28 | Tier 2 | e.g. Ubuntu 20.04, RHEL 8 |
112+
| GNU/Linux | s390x | kernel >= 4.18[^1], glibc >= 2.28 | Tier 2 | e.g. RHEL 8 |
113+
| GNU/Linux | loong64 | kernel >= 5.19, glibc >= 2.36 | Experimental | |
114+
| Windows | x64 | >= Windows 10/Server 2016 | Tier 1 | [^2],[^3] |
115+
| Windows | x64 | Windows 8.1/Server 2012 | Experimental | |
116+
| Windows | arm64 | >= Windows 10 | Tier 2 | |
117+
| macOS | x64 | >= 11.0 | Tier 1 | For notes about compilation see [^4] |
118+
| macOS | arm64 | >= 11.0 | Tier 1 | |
119+
| SmartOS | x64 | >= 18 | Tier 2 | |
120+
| AIX | ppc64be >=power8 | >= 7.2 TL04 | Tier 2 | |
121+
| FreeBSD | x64 | >= 13.2 | Experimental | |
123122

124123
<!--lint disable final-definition-->
125124

@@ -141,12 +140,7 @@ platforms. This is true regardless of entries in the table below.
141140
Windows binary (`node.exe`) in WSL will not work without workarounds such as
142141
stdio redirection.
143142

144-
[^4]: Running Node.js on x86 Windows should work and binaries
145-
are provided. However, tests in our infrastructure only run on WoW64.
146-
Furthermore, compiling on x86 Windows is Experimental and
147-
may not be possible.
148-
149-
[^5]: Our macOS x64 Binaries are compiled with 11.0 as a target. Xcode 13 is
143+
[^4]: Our macOS x64 Binaries are compiled with 11.0 as a target. Xcode 13 is
150144
required to compile.
151145

152146
<!--lint enable final-definition-->
@@ -175,7 +169,7 @@ Binaries at <https://nodejs.org/download/release/> are produced on:
175169
| linux-ppc64le | RHEL 8 with gcc-toolset-10[^6] |
176170
| linux-s390x | RHEL 8 with gcc-toolset-10[^6] |
177171
| linux-x64 | RHEL 8 with gcc-toolset-10[^6] |
178-
| win-x64 and win-x86 | Windows Server 2022 (x64) with Visual Studio 2022 |
172+
| win-x64 | Windows Server 2022 (x64) with Visual Studio 2022 |
179173

180174
<!--lint disable final-definition-->
181175

Diff for: ‎configure.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1270,18 +1270,17 @@ def host_arch_cc():
12701270
def host_arch_win():
12711271
"""Host architecture check using environ vars (better way to do this?)"""
12721272

1273-
observed_arch = os.environ.get('PROCESSOR_ARCHITECTURE', 'x86')
1273+
observed_arch = os.environ.get('PROCESSOR_ARCHITECTURE', 'AMD64')
12741274
arch = os.environ.get('PROCESSOR_ARCHITEW6432', observed_arch)
12751275

12761276
matchup = {
12771277
'AMD64' : 'x64',
1278-
'x86' : 'ia32',
12791278
'arm' : 'arm',
12801279
'mips' : 'mips',
12811280
'ARM64' : 'arm64'
12821281
}
12831282

1284-
return matchup.get(arch, 'ia32')
1283+
return matchup.get(arch, 'x64')
12851284

12861285

12871286
def configure_arm(o):

Diff for: ‎node.gyp

-9
Original file line numberDiff line numberDiff line change
@@ -475,15 +475,6 @@
475475
],
476476
},
477477

478-
# Relevant only for x86.
479-
# Refs: https://github.com/nodejs/node/pull/25852
480-
# Refs: https://docs.microsoft.com/en-us/cpp/build/reference/safeseh-image-has-safe-exception-handlers
481-
'msvs_settings': {
482-
'VCLinkerTool': {
483-
'ImageHasSafeExceptionHandlers': 'false',
484-
},
485-
},
486-
487478
'conditions': [
488479
# Pointer authentication for ARM64.
489480
['target_arch=="arm64"', {

Diff for: ‎src/node_metadata.cc

+1-3
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,7 @@ Metadata::Release::Release() : name(NODE_RELEASE) {
146146
source_url = NODE_RELEASE_URLFPFX ".tar.gz";
147147
headers_url = NODE_RELEASE_URLFPFX "-headers.tar.gz";
148148
#ifdef _WIN32
149-
lib_url = strcmp(NODE_ARCH, "ia32") ? NODE_RELEASE_URLPFX "win-" NODE_ARCH
150-
"/node.lib"
151-
: NODE_RELEASE_URLPFX "win-x86/node.lib";
149+
lib_url = NODE_RELEASE_URLPFX "win-" NODE_ARCH "/node.lib";
152150
#endif // _WIN32
153151

154152
#endif // NODE_HAS_RELEASE_URLS

Diff for: ‎test/parallel/parallel.status

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ test-error-serdes: PASS, FLAKY
2121

2222
[$system==win32]
2323

24-
# Windows on x86
25-
[$system==win32 && $arch==ia32]
26-
test-worker-nearheaplimit-deadlock: PASS, FLAKY
27-
2824
# Windows on ARM
2925
[$system==win32 && $arch==arm64]
3026

Diff for: ‎test/parallel/test-navigator.js

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ assert.strictEqual(getNavigatorPlatform({ arch: 'arm64', platform: 'darwin' }),
6262
assert.strictEqual(getNavigatorPlatform({ arch: 'ia32', platform: 'linux' }), 'Linux i686');
6363
assert.strictEqual(getNavigatorPlatform({ arch: 'x64', platform: 'linux' }), 'Linux x86_64');
6464
assert.strictEqual(getNavigatorPlatform({ arch: 'arm64', platform: 'linux' }), 'Linux arm64');
65-
assert.strictEqual(getNavigatorPlatform({ arch: 'ia32', platform: 'win32' }), 'Win32');
6665
assert.strictEqual(getNavigatorPlatform({ arch: 'x64', platform: 'win32' }), 'Win32');
6766
assert.strictEqual(getNavigatorPlatform({ arch: 'arm64', platform: 'win32' }), 'Win32');
6867
assert.strictEqual(getNavigatorPlatform({ arch: 'ia32', platform: 'freebsd' }), 'FreeBSD i386');

Diff for: ‎tools/msvs/msi/custom_actions/custom_actions.vcxproj

-76
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM64</Platform>
77
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Debug|Win32">
9-
<Configuration>Debug</Configuration>
10-
<Platform>Win32</Platform>
11-
</ProjectConfiguration>
128
<ProjectConfiguration Include="Debug|x64">
139
<Configuration>Debug</Configuration>
1410
<Platform>x64</Platform>
@@ -17,10 +13,6 @@
1713
<Configuration>Release</Configuration>
1814
<Platform>ARM64</Platform>
1915
</ProjectConfiguration>
20-
<ProjectConfiguration Include="Release|Win32">
21-
<Configuration>Release</Configuration>
22-
<Platform>Win32</Platform>
23-
</ProjectConfiguration>
2416
<ProjectConfiguration Include="Release|x64">
2517
<Configuration>Release</Configuration>
2618
<Platform>x64</Platform>
@@ -33,12 +25,6 @@
3325
<ProjectName>custom_actions</ProjectName>
3426
</PropertyGroup>
3527
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
36-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
37-
<ConfigurationType>DynamicLibrary</ConfigurationType>
38-
<PlatformToolset>$(PlatformToolset)</PlatformToolset>
39-
<CharacterSet>Unicode</CharacterSet>
40-
<WholeProgramOptimization>true</WholeProgramOptimization>
41-
</PropertyGroup>
4228
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
4329
<ConfigurationType>DynamicLibrary</ConfigurationType>
4430
<PlatformToolset>$(PlatformToolset)</PlatformToolset>
@@ -51,11 +37,6 @@
5137
<CharacterSet>Unicode</CharacterSet>
5238
<WholeProgramOptimization>true</WholeProgramOptimization>
5339
</PropertyGroup>
54-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
55-
<ConfigurationType>DynamicLibrary</ConfigurationType>
56-
<PlatformToolset>$(PlatformToolset)</PlatformToolset>
57-
<CharacterSet>Unicode</CharacterSet>
58-
</PropertyGroup>
5940
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
6041
<ConfigurationType>DynamicLibrary</ConfigurationType>
6142
<PlatformToolset>$(PlatformToolset)</PlatformToolset>
@@ -69,18 +50,12 @@
6950
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7051
<ImportGroup Label="ExtensionSettings">
7152
</ImportGroup>
72-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
73-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
74-
</ImportGroup>
7553
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
7654
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7755
</ImportGroup>
7856
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
7957
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
8058
</ImportGroup>
81-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
82-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
83-
</ImportGroup>
8459
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
8560
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
8661
</ImportGroup>
@@ -91,43 +66,18 @@
9166
<PropertyGroup>
9267
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
9368
</PropertyGroup>
94-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
95-
<LinkIncremental>true</LinkIncremental>
96-
</PropertyGroup>
9769
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
9870
<LinkIncremental>true</LinkIncremental>
9971
</PropertyGroup>
10072
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
10173
<LinkIncremental>true</LinkIncremental>
10274
</PropertyGroup>
103-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
104-
<LinkIncremental>false</LinkIncremental>
105-
</PropertyGroup>
10675
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
10776
<LinkIncremental>false</LinkIncremental>
10877
</PropertyGroup>
10978
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
11079
<LinkIncremental>false</LinkIncremental>
11180
</PropertyGroup>
112-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
113-
<ClCompile>
114-
<Optimization>Disabled</Optimization>
115-
<AdditionalIncludeDirectories>$(PkgWixToolset_WcaUtil)\build\native\include;$(PkgWixToolset_DUtil)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
116-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
118-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
119-
<PrecompiledHeader>NotUsing</PrecompiledHeader>
120-
<WarningLevel>Level3</WarningLevel>
121-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
122-
</ClCompile>
123-
<Link>
124-
<AdditionalDependencies>msi.lib;dutil.lib;wcautil.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
125-
<AdditionalLibraryDirectories>$(PkgWixToolset_WcaUtil)\build\native\v14\x86;$(PkgWixToolset_DUtil)\build\native\v14\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
126-
<ModuleDefinitionFile>custom_actions.def</ModuleDefinitionFile>
127-
<GenerateDebugInformation>true</GenerateDebugInformation>
128-
<SubSystem>Windows</SubSystem>
129-
</Link>
130-
</ItemDefinitionGroup>
13181
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
13282
<ClCompile>
13383
<Optimization>Disabled</Optimization>
@@ -166,32 +116,6 @@
166116
<SubSystem>Windows</SubSystem>
167117
</Link>
168118
</ItemDefinitionGroup>
169-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
170-
<ClCompile>
171-
<Optimization>MaxSpeed</Optimization>
172-
<IntrinsicFunctions>true</IntrinsicFunctions>
173-
<AdditionalIncludeDirectories>$(PkgWixToolset_WcaUtil)\build\native\include;$(PkgWixToolset_DUtil)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
174-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
175-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
176-
<FunctionLevelLinking>true</FunctionLevelLinking>
177-
<WarningLevel>Level3</WarningLevel>
178-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
179-
<PrecompiledHeader>NotUsing</PrecompiledHeader>
180-
<PrecompiledHeaderFile>
181-
</PrecompiledHeaderFile>
182-
<PrecompiledHeaderOutputFile>
183-
</PrecompiledHeaderOutputFile>
184-
</ClCompile>
185-
<Link>
186-
<AdditionalDependencies>msi.lib;dutil.lib;wcautil.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
187-
<AdditionalLibraryDirectories>$(PkgWixToolset_WcaUtil)\build\native\v14\x86;$(PkgWixToolset_DUtil)\build\native\v14\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
188-
<ModuleDefinitionFile>custom_actions.def</ModuleDefinitionFile>
189-
<GenerateDebugInformation>true</GenerateDebugInformation>
190-
<SubSystem>Windows</SubSystem>
191-
<OptimizeReferences>true</OptimizeReferences>
192-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
193-
</Link>
194-
</ItemDefinitionGroup>
195119
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
196120
<ClCompile>
197121
<Optimization>MaxSpeed</Optimization>

Diff for: ‎tools/msvs/msi/nodemsi.sln

-10
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,26 @@ Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1414
Debug|ARM64 = Debug|ARM64
1515
Debug|x64 = Debug|x64
16-
Debug|x86 = Debug|x86
1716
Release|ARM64 = Release|ARM64
1817
Release|x64 = Release|x64
19-
Release|x86 = Release|x86
2018
EndGlobalSection
2119
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2220
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Debug|ARM64.ActiveCfg = Debug|arm64
2321
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Debug|ARM64.Build.0 = Debug|arm64
2422
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Debug|x64.ActiveCfg = Debug|x64
2523
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Debug|x64.Build.0 = Debug|x64
26-
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Debug|x86.ActiveCfg = Debug|x86
27-
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Debug|x86.Build.0 = Debug|x86
2824
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Release|ARM64.ActiveCfg = Release|arm64
2925
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Release|ARM64.Build.0 = Release|arm64
3026
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Release|x64.ActiveCfg = Release|x64
3127
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Release|x64.Build.0 = Release|x64
32-
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Release|x86.ActiveCfg = Release|x86
33-
{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}.Release|x86.Build.0 = Release|x86
3428
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Debug|ARM64.ActiveCfg = Debug|ARM64
3529
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Debug|ARM64.Build.0 = Debug|ARM64
3630
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Debug|x64.ActiveCfg = Debug|x64
3731
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Debug|x64.Build.0 = Debug|x64
38-
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Debug|x86.ActiveCfg = Debug|Win32
39-
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Debug|x86.Build.0 = Debug|Win32
4032
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Release|ARM64.ActiveCfg = Release|ARM64
4133
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Release|ARM64.Build.0 = Release|ARM64
4234
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Release|x64.ActiveCfg = Release|x64
4335
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Release|x64.Build.0 = Release|x64
44-
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Release|x86.ActiveCfg = Release|Win32
45-
{B70585F8-DAB7-40FA-9904-13CF53A73A06}.Release|x86.Build.0 = Release|Win32
4636
EndGlobalSection
4737
GlobalSection(SolutionProperties) = preSolution
4838
HideSolutionNode = FALSE

Diff for: ‎tools/msvs/msi/nodemsi/nodemsi.wixproj

+1-11
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,13 @@
22
<Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.0-rc.1" />
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
5+
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
66
<ProductVersion>3.5</ProductVersion>
77
<ProjectGuid>{1d808ff0-b5a9-4be9-859d-b334b6f48be2}</ProjectGuid>
88
<OutputName>node-v$(FullVersion)-$(Platform)</OutputName>
99
<OutputType>Package</OutputType>
1010
<NodeVersion Condition=" '$(NodeVersion)' == '' ">0.0.0.0</NodeVersion>
1111
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
13-
<OutputPath>..\..\..\..\</OutputPath>
14-
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
15-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants>
16-
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
18-
<OutputPath>..\..\..\..\</OutputPath>
19-
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
20-
<DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NpmSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm\;CorepackSourceDir=..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants>
21-
</PropertyGroup>
2212
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
2313
<OutputPath>..\..\..\..\</OutputPath>
2414
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>

Diff for: ‎tools/v8_gypfiles/toolchain.gypi

-16
Original file line numberDiff line numberDiff line change
@@ -550,14 +550,6 @@
550550
'CharacterSet': '1',
551551
},
552552
}],
553-
['OS=="win" and v8_target_arch=="ia32"', {
554-
'msvs_settings': {
555-
'VCCLCompilerTool': {
556-
# Ensure no surprising artifacts from 80bit double math with x86.
557-
'AdditionalOptions': ['/arch:SSE2'],
558-
},
559-
},
560-
}],
561553
['OS=="win" and v8_enable_prof==1', {
562554
'msvs_settings': {
563555
'VCLinkerTool': {
@@ -962,13 +954,5 @@
962954
4724, # https://crbug.com/v8/7771
963955
4800, # Forcing value to bool.
964956
],
965-
# Relevant only for x86.
966-
# Refs: https://github.com/nodejs/node/pull/25852
967-
# Refs: https://docs.microsoft.com/en-us/cpp/build/reference/safeseh-image-has-safe-exception-handlers
968-
'msvs_settings': {
969-
'VCLinkerTool': {
970-
'ImageHasSafeExceptionHandlers': 'false',
971-
},
972-
},
973957
}, # target_defaults
974958
}

Diff for: ‎tools/v8_gypfiles/v8.gyp

-5
Original file line numberDiff line numberDiff line change
@@ -1951,11 +1951,6 @@
19511951
'<(V8_ROOT)/src/heap/base/asm/x64/push_registers_masm.asm',
19521952
],
19531953
}],
1954-
['_toolset == "host" and host_arch == "ia32" or _toolset == "target" and target_arch=="ia32"', {
1955-
'sources': [
1956-
'<(V8_ROOT)/src/heap/base/asm/ia32/push_registers_masm.asm',
1957-
],
1958-
}],
19591954
['_toolset == "host" and host_arch == "arm64" or _toolset == "target" and target_arch=="arm64"', {
19601955
'sources': [
19611956
'<(V8_ROOT)/src/heap/base/asm/arm64/push_registers_masm.S',

Diff for: ‎vcbuild.bat

+9-8
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,11 @@ if defined debug_nghttp2 set configure_flags=%configure_flags% --debug-nghttp
203203
if defined openssl_no_asm set configure_flags=%configure_flags% --openssl-no-asm
204204
if defined no_shared_roheap set configure_flags=%configure_flags% --disable-shared-readonly-heap
205205
if defined DEBUG_HELPER set configure_flags=%configure_flags% --verbose
206-
if "%target_arch%"=="x86" if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set configure_flags=%configure_flags% --no-cross-compiling
206+
207+
if "%target_arch%"=="x86" (
208+
echo "32-bit Windows builds are not supported anymore."
209+
exit /b 1
210+
)
207211

208212
if not exist "%~dp0deps\icu" goto no-depsicu
209213
if "%target%"=="Clean" echo deleting %~dp0deps\icu
@@ -220,7 +224,7 @@ if "%target%"=="TestClean" (
220224
call tools\msvs\find_python.cmd
221225
if errorlevel 1 goto :exit
222226

223-
REM NASM is only needed on IA32 and x86_64.
227+
REM NASM is only needed on x86_64.
224228
if not defined openssl_no_asm if "%target_arch%" NEQ "arm64" call tools\msvs\find_nasm.cmd
225229
if errorlevel 1 echo Could not find NASM, install it or build with openssl-no-asm. See BUILDING.md.
226230

@@ -236,9 +240,7 @@ if defined noprojgen if defined nobuild goto :after-build
236240

237241
@rem Set environment for msbuild
238242

239-
set msvs_host_arch=x86
240-
if _%PROCESSOR_ARCHITECTURE%_==_AMD64_ set msvs_host_arch=amd64
241-
if _%PROCESSOR_ARCHITEW6432%_==_AMD64_ set msvs_host_arch=amd64
243+
set msvs_host_arch=amd64
242244
if _%PROCESSOR_ARCHITECTURE%_==_ARM64_ set msvs_host_arch=arm64
243245
@rem usually vcvarsall takes an argument: host + '_' + target
244246
set vcvarsall_arg=%msvs_host_arch%_%target_arch%
@@ -319,8 +321,7 @@ if defined nobuild goto :after-build
319321
@rem Build the sln with msbuild.
320322
set "msbcpu=/m:2"
321323
if "%NUMBER_OF_PROCESSORS%"=="1" set "msbcpu=/m:1"
322-
set "msbplatform=Win32"
323-
if "%target_arch%"=="x64" set "msbplatform=x64"
324+
set "msbplatform=x64"
324325
if "%target_arch%"=="arm64" set "msbplatform=ARM64"
325326
if "%target%"=="Build" (
326327
if defined no_cctest set target=node
@@ -753,7 +754,7 @@ set exit_code=1
753754
goto exit
754755

755756
:help
756-
echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-internet/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [clang-cl] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [nocorepack] [ltcg] [licensetf] [sign] [ia32/x86/x64/arm64] [vs2022] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-md] [lint-md-build] [format-md] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm]
757+
echo vcbuild.bat [debug/release] [msi] [doc] [test/test-all/test-addons/test-doc/test-js-native-api/test-node-api/test-internet/test-tick-processor/test-known-issues/test-node-inspect/test-check-deopts/test-npm/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [ignore-flaky] [static/dll] [noprojgen] [projgen] [clang-cl] [small-icu/full-icu/without-intl] [nobuild] [nosnapshot] [nonpm] [nocorepack] [ltcg] [licensetf] [sign] [x64/arm64] [vs2022] [download-all] [enable-vtune] [lint/lint-ci/lint-js/lint-md] [lint-md-build] [format-md] [package] [build-release] [upload] [no-NODE-OPTIONS] [link-module path-to-module] [debug-http2] [debug-nghttp2] [clean] [cctest] [no-cctest] [openssl-no-asm]
757758
echo Examples:
758759
echo vcbuild.bat : builds release build
759760
echo vcbuild.bat debug : builds debug build

0 commit comments

Comments
 (0)
Please sign in to comment.