Skip to content

Commit 15f2fb9

Browse files
richardlauRafaelGSS
authored andcommitted
build: remove support for s390 32-bit
V8 removed support for it. Refs: v8/v8@9565a9a PR-URL: #58070 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]>
1 parent 4ab254c commit 15f2fb9

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -949,9 +949,6 @@ else
949949
ifeq ($(findstring s390x,$(UNAME_M)),s390x)
950950
DESTCPU ?= s390x
951951
else
952-
ifeq ($(findstring s390,$(UNAME_M)),s390)
953-
DESTCPU ?= s390
954-
else
955952
ifeq ($(findstring OS/390,$(shell uname -s)),OS/390)
956953
DESTCPU ?= s390x
957954
else
@@ -985,7 +982,6 @@ endif
985982
endif
986983
endif
987984
endif
988-
endif
989985
ifeq ($(DESTCPU),x64)
990986
ARCH=x64
991987
else
@@ -998,9 +994,6 @@ else
998994
ifeq ($(DESTCPU),ppc64)
999995
ARCH=ppc64
1000996
else
1001-
ifeq ($(DESTCPU),s390)
1002-
ARCH=s390
1003-
else
1004997
ifeq ($(DESTCPU),s390x)
1005998
ARCH=s390x
1006999
else
@@ -1018,7 +1011,6 @@ endif
10181011
endif
10191012
endif
10201013
endif
1021-
endif
10221014

10231015
# node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32').
10241016
# pass the proper v8 arch name to $V8_ARCH based on user-specified $DESTCPU.

doc/api/os.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ added: v0.5.0
5555

5656
Returns the operating system CPU architecture for which the Node.js binary was
5757
compiled. Possible values are `'arm'`, `'arm64'`, `'ia32'`, `'loong64'`,
58-
`'mips'`, `'mipsel'`, `'ppc64'`, `'riscv64'`, `'s390'`, `'s390x'`,
59-
and `'x64'`.
58+
`'mips'`, `'mipsel'`, `'ppc64'`, `'riscv64'`, `'s390x'`, and `'x64'`.
6059

6160
The return value is equivalent to [`process.arch`][].
6261

@@ -257,7 +256,7 @@ added:
257256
* Returns: {string}
258257

259258
Returns the machine type as a string, such as `arm`, `arm64`, `aarch64`,
260-
`mips`, `mips64`, `ppc64`, `ppc64le`, `s390`, `s390x`, `i386`, `i686`, `x86_64`.
259+
`mips`, `mips64`, `ppc64`, `ppc64le`, `s390x`, `i386`, `i686`, `x86_64`.
261260

262261
On POSIX systems, the machine type is determined by calling
263262
[`uname(3)`][]. On Windows, `RtlGetVersion()` is used, and if it is not

tools/v8_gypfiles/v8.gyp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -791,12 +791,12 @@
791791
}],
792792
['v8_target_arch=="s390x"', {
793793
'sources': [
794-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"s390\\".*?sources \\+= ")',
794+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"s390x\\".*?sources \\+= ")',
795795
],
796796
'conditions': [
797797
['v8_enable_sparkplug==1', {
798798
'sources': [
799-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"s390\\".*?v8_enable_sparkplug.*?sources \\+= ")',
799+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"s390x\\".*?v8_enable_sparkplug.*?sources \\+= ")',
800800
],
801801
}],
802802
],
@@ -1218,7 +1218,7 @@
12181218
}],
12191219
['v8_target_arch=="s390x"', {
12201220
'sources': [
1221-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"s390\\".*?sources \\+= ")',
1221+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"s390x\\".*?sources \\+= ")',
12221222
],
12231223
}],
12241224
['v8_target_arch=="riscv64"', {

0 commit comments

Comments
 (0)