Skip to content

Commit 470db47

Browse files
bnoordhuistargos
bnoordhuis
authored and
targos
committed
build: remove support for s390 (but not s390x)
Upstream V8 removed support for s390 earlier this year and it's known to no longer build. Remove the support from our build scripts. Fixes: #28866 PR-URL: #28883 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 3d51d30 commit 470db47

File tree

11 files changed

+13
-31
lines changed

11 files changed

+13
-31
lines changed

‎common.gypi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,10 +393,6 @@
393393
'cflags': [ '-m64', '-mminimal-toc' ],
394394
'ldflags': [ '-m64' ],
395395
}],
396-
[ 'target_arch=="s390"', {
397-
'cflags': [ '-m31', '-march=z196' ],
398-
'ldflags': [ '-m31', '-march=z196' ],
399-
}],
400396
[ 'target_arch=="s390x"', {
401397
'cflags': [ '-m64', '-march=z196' ],
402398
'ldflags': [ '-m64', '-march=z196' ],

‎configure.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
4848
'android', 'aix', 'cloudabi')
4949
valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc',
50-
'ppc64', 'x32','x64', 'x86', 'x86_64', 's390', 's390x')
50+
'ppc64', 'x32','x64', 'x86', 'x86_64', 's390x')
5151
valid_arm_float_abi = ('soft', 'softfp', 'hard')
5252
valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon')
5353
valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx')
@@ -867,7 +867,6 @@ def host_arch_cc():
867867
'__PPC64__' : 'ppc64',
868868
'__PPC__' : 'ppc64',
869869
'__x86_64__' : 'x64',
870-
'__s390__' : 's390',
871870
'__s390x__' : 's390x',
872871
}
873872

@@ -876,8 +875,7 @@ def host_arch_cc():
876875
for i in matchup:
877876
if i in k and k[i] != '0':
878877
rtn = matchup[i]
879-
if rtn != 's390':
880-
break
878+
break
881879

882880
if rtn == 'mipsel' and '_LP64' in k:
883881
rtn = 'mips64el'

‎deps/openssl/openssl-cl_asm.gypi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
'includes': ['config/archs/linux-ppc64le/asm/openssl-cl.gypi'],
1111
}, 'target_arch=="ppc64" and OS=="linux"', {
1212
'includes': ['config/archs/linux-ppc64/asm/openssl-cl.gypi'],
13-
}, 'target_arch=="s390" and OS=="linux"', {
14-
'includes': ['config/archs/linux32-s390x/asm/openssl-cl.gypi'],
1513
}, 'target_arch=="s390x" and OS=="linux"', {
1614
'includes': ['config/archs/linux64-s390x/asm/openssl-cl.gypi'],
1715
}, 'target_arch=="arm" and OS=="linux"', {

‎deps/openssl/openssl-cl_asm_avx2.gypi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl-cl.gypi'],
1111
}, 'target_arch=="ppc64" and OS=="linux"', {
1212
'includes': ['config/archs/linux-ppc64/asm_avx2/openssl-cl.gypi'],
13-
}, 'target_arch=="s390" and OS=="linux"', {
14-
'includes': ['config/archs/linux32-s390x/asm_avx2/openssl-cl.gypi'],
1513
}, 'target_arch=="s390x" and OS=="linux"', {
1614
'includes': ['config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi'],
1715
}, 'target_arch=="arm" and OS=="linux"', {

‎deps/openssl/openssl-cl_no_asm.gypi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
'includes': ['config/archs/linux-ppc64le/no-asm/openssl-cl.gypi'],
1111
}, 'target_arch=="ppc64" and OS=="linux"', {
1212
'includes': ['config/archs/linux-ppc64/no-asm/openssl-cl.gypi'],
13-
}, 'target_arch=="s390" and OS=="linux"', {
14-
'includes': ['config/archs/linux32-s390x/no-asm/openssl-cl.gypi'],
1513
}, 'target_arch=="s390x" and OS=="linux"', {
1614
'includes': ['config/archs/linux64-s390x/no-asm/openssl-cl.gypi'],
1715
}, 'target_arch=="arm" and OS=="linux"', {

‎deps/openssl/openssl_asm.gypi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
'includes': ['config/archs/linux-ppc64le/asm/openssl.gypi'],
1111
}, 'target_arch=="ppc64" and OS=="linux"', {
1212
'includes': ['config/archs/linux-ppc64/asm/openssl.gypi'],
13-
}, 'target_arch=="s390" and OS=="linux"', {
14-
'includes': ['config/archs/linux32-s390x/asm/openssl.gypi'],
1513
}, 'target_arch=="s390x" and OS=="linux"', {
1614
'includes': ['config/archs/linux64-s390x/asm/openssl.gypi'],
1715
}, 'target_arch=="arm" and OS=="linux"', {

‎deps/openssl/openssl_asm_avx2.gypi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl.gypi'],
1111
}, 'target_arch=="ppc64" and OS=="linux"', {
1212
'includes': ['config/archs/linux-ppc64/asm_avx2/openssl.gypi'],
13-
}, 'target_arch=="s390" and OS=="linux"', {
14-
'includes': ['config/archs/linux32-s390x/asm_avx2/openssl.gypi'],
1513
}, 'target_arch=="s390x" and OS=="linux"', {
1614
'includes': ['config/archs/linux64-s390x/asm_avx2/openssl.gypi'],
1715
}, 'target_arch=="arm" and OS=="linux"', {

‎deps/openssl/openssl_no_asm.gypi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
'includes': ['config/archs/linux-ppc64le/no-asm/openssl.gypi'],
1212
}, 'target_arch=="ppc64" and OS=="linux"', {
1313
'includes': ['config/archs/linux-ppc64/no-asm/openssl.gypi'],
14-
}, 'target_arch=="s390" and OS=="linux"', {
15-
'includes': ['config/archs/linux32-s390x/no-asm/openssl.gypi'],
1614
}, 'target_arch=="s390x" and OS=="linux"', {
1715
'includes': ['config/archs/linux64-s390x/no-asm/openssl.gypi'],
1816
}, 'target_arch=="arm" and OS=="linux"', {

‎tools/v8_gypfiles/broken/standalone.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
}, {
166166
'gomadir': '<!(/bin/echo -n ${HOME}/goma)',
167167
}],
168-
['host_arch!="ppc" and host_arch!="ppc64" and host_arch!="ppc64le" and host_arch!="s390" and host_arch!="s390x"', {
168+
['host_arch!="ppc" and host_arch!="ppc64" and host_arch!="ppc64le" and host_arch!="s390x"', {
169169
'host_clang%': 1,
170170
}, {
171171
'host_clang%': 0,

‎tools/v8_gypfiles/toolchain.gypi

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
'conditions': [
141141
['host_arch=="ia32" or host_arch=="x64" or \
142142
host_arch=="ppc" or host_arch=="ppc64" or \
143-
host_arch=="s390" or host_arch=="s390x" or \
143+
host_arch=="s390x" or \
144144
clang==1', {
145145
'variables': {
146146
'host_cxx_is_biarch%': 1,
@@ -151,7 +151,7 @@
151151
},
152152
}],
153153
['target_arch=="ia32" or target_arch=="x64" or \
154-
target_arch=="ppc" or target_arch=="ppc64" or target_arch=="s390" or \
154+
target_arch=="ppc" or target_arch=="ppc64" or \
155155
target_arch=="s390x" or clang==1', {
156156
'variables': {
157157
'target_cxx_is_biarch%': 1,
@@ -302,7 +302,7 @@
302302
'V8_TARGET_ARCH_ARM64',
303303
],
304304
}],
305-
['v8_target_arch=="s390" or v8_target_arch=="s390x"', {
305+
['v8_target_arch=="s390x"', {
306306
'defines': [
307307
'V8_TARGET_ARCH_S390',
308308
],
@@ -320,7 +320,7 @@
320320
'cflags': [ '-march=z196' ],
321321
}],
322322
],
323-
}], # s390
323+
}], # s390x
324324
['v8_target_arch=="ppc" or v8_target_arch=="ppc64"', {
325325
'defines': [
326326
'V8_TARGET_ARCH_PPC',
@@ -1045,13 +1045,13 @@
10451045
or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
10461046
(v8_target_arch=="arm" or v8_target_arch=="ia32" or \
10471047
v8_target_arch=="mips" or v8_target_arch=="mipsel" or \
1048-
v8_target_arch=="ppc" or v8_target_arch=="s390")', {
1048+
v8_target_arch=="ppc")', {
10491049
'target_conditions': [
10501050
['_toolset=="host"', {
10511051
'conditions': [
10521052
['host_cxx_is_biarch==1', {
10531053
'conditions': [
1054-
['host_arch=="s390" or host_arch=="s390x"', {
1054+
['host_arch=="s390x"', {
10551055
'cflags': [ '-m31' ],
10561056
'ldflags': [ '-m31' ]
10571057
},{
@@ -1069,7 +1069,7 @@
10691069
'conditions': [
10701070
['target_cxx_is_biarch==1', {
10711071
'conditions': [
1072-
['host_arch=="s390" or host_arch=="s390x"', {
1072+
['host_arch=="s390x"', {
10731073
'cflags': [ '-m31' ],
10741074
'ldflags': [ '-m31' ]
10751075
},{

‎tools/v8_gypfiles/v8.gyp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@
653653
'<(V8_ROOT)/src/builtins/ppc/builtins-ppc.cc',
654654
],
655655
}],
656-
['v8_target_arch=="s390" or v8_target_arch=="s390x"', {
656+
['v8_target_arch=="s390x"', {
657657
'sources': [
658658
'<(V8_ROOT)/src/builtins/s390/builtins-s390.cc',
659659
],
@@ -2187,7 +2187,7 @@
21872187
'<(V8_ROOT)/src/wasm/baseline/ppc/liftoff-assembler-ppc.h',
21882188
],
21892189
}],
2190-
['v8_target_arch=="s390" or v8_target_arch=="s390x"', {
2190+
['v8_target_arch=="s390x"', {
21912191
'sources': [ ### gcmole(arch:s390) ###
21922192
'<(V8_ROOT)/src/compiler/backend/s390/code-generator-s390.cc',
21932193
'<(V8_ROOT)/src/compiler/backend/s390/instruction-codes-s390.h',
@@ -2298,7 +2298,7 @@
22982298
}],
22992299
# Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
23002300
# to implement atomic memory access
2301-
['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "ppc64", "s390", "s390x"]', {
2301+
['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "ppc64", "s390x"]', {
23022302
'link_settings': {
23032303
'libraries': ['-latomic', ],
23042304
},

0 commit comments

Comments
 (0)