Skip to content

Commit a2d83c0

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 fdc47b5 commit a2d83c0

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
@@ -910,9 +910,6 @@ else
910910
ifeq ($(findstring s390x,$(UNAME_M)),s390x)
911911
DESTCPU ?= s390x
912912
else
913-
ifeq ($(findstring s390,$(UNAME_M)),s390)
914-
DESTCPU ?= s390
915-
else
916913
ifeq ($(findstring OS/390,$(shell uname -s)),OS/390)
917914
DESTCPU ?= s390x
918915
else
@@ -942,7 +939,6 @@ endif
942939
endif
943940
endif
944941
endif
945-
endif
946942
ifeq ($(DESTCPU),x64)
947943
ARCH=x64
948944
else
@@ -955,9 +951,6 @@ else
955951
ifeq ($(DESTCPU),ppc64)
956952
ARCH=ppc64
957953
else
958-
ifeq ($(DESTCPU),s390)
959-
ARCH=s390
960-
else
961954
ifeq ($(DESTCPU),s390x)
962955
ARCH=s390x
963956
else
@@ -971,7 +964,6 @@ endif
971964
endif
972965
endif
973966
endif
974-
endif
975967

976968
# node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32').
977969
# 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
@@ -778,12 +778,12 @@
778778
}],
779779
['v8_target_arch=="s390x"', {
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\\".*?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\\".*?sources \\+= ")',
782782
],
783783
'conditions': [
784784
['v8_enable_sparkplug==1', {
785785
'sources': [
786-
'<!@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 \\+= ")',
786+
'<!@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 \\+= ")',
787787
],
788788
}],
789789
],
@@ -1152,7 +1152,7 @@
11521152
}],
11531153
['v8_target_arch=="s390x"', {
11541154
'sources': [
1155-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"s390\\".*?sources \\+= ")',
1155+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"s390x\\".*?sources \\+= ")',
11561156
],
11571157
}],
11581158
['v8_target_arch=="riscv64"', {

0 commit comments

Comments
 (0)