Skip to content

Commit 3a9e06d

Browse files
richardlaunodejs-github-bot
authored andcommitted
build: remove support for s390 32-bit
V8 removed support for it. Refs: v8/v8@9565a9a
1 parent 33fb9f7 commit 3a9e06d

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
@@ -908,9 +908,6 @@ else
908908
ifeq ($(findstring s390x,$(UNAME_M)),s390x)
909909
DESTCPU ?= s390x
910910
else
911-
ifeq ($(findstring s390,$(UNAME_M)),s390)
912-
DESTCPU ?= s390
913-
else
914911
ifeq ($(findstring OS/390,$(shell uname -s)),OS/390)
915912
DESTCPU ?= s390x
916913
else
@@ -940,7 +937,6 @@ endif
940937
endif
941938
endif
942939
endif
943-
endif
944940
ifeq ($(DESTCPU),x64)
945941
ARCH=x64
946942
else
@@ -953,9 +949,6 @@ else
953949
ifeq ($(DESTCPU),ppc64)
954950
ARCH=ppc64
955951
else
956-
ifeq ($(DESTCPU),s390)
957-
ARCH=s390
958-
else
959952
ifeq ($(DESTCPU),s390x)
960953
ARCH=s390x
961954
else
@@ -969,7 +962,6 @@ endif
969962
endif
970963
endif
971964
endif
972-
endif
973965

974966
# node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32').
975967
# 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
@@ -773,12 +773,12 @@
773773
}],
774774
['v8_target_arch=="s390x"', {
775775
'sources': [
776-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"s390\\".*?sources \\+= ")',
776+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"s390x\\".*?sources \\+= ")',
777777
],
778778
'conditions': [
779779
['v8_enable_sparkplug==1', {
780780
'sources': [
781-
'<!@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 \\+= ")',
781+
'<!@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 \\+= ")',
782782
],
783783
}],
784784
],
@@ -1142,7 +1142,7 @@
11421142
}],
11431143
['v8_target_arch=="s390x"', {
11441144
'sources': [
1145-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"s390\\".*?sources \\+= ")',
1145+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"s390x\\".*?sources \\+= ")',
11461146
],
11471147
}],
11481148
['v8_target_arch=="riscv64"', {

0 commit comments

Comments
 (0)