From fd9e0f72abd8b7712ba504596acd2fdcc04611f9 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sun, 28 Jul 2019 21:14:57 +0200 Subject: build: remove support for s390 (but not s390x) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: https://github.com/nodejs/node/issues/28866 PR-URL: https://github.com/nodejs/node/pull/28883 Reviewed-By: Michaël Zasso Reviewed-By: Beth Griggs Reviewed-By: Сковорода Никита Андреевич Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Richard Lau Reviewed-By: Luigi Pinca Reviewed-By: Rich Trott --- configure.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'configure.py') diff --git a/configure.py b/configure.py index a791efebbc..cc805d3fd1 100755 --- a/configure.py +++ b/configure.py @@ -47,7 +47,7 @@ parser = optparse.OptionParser() valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux', 'android', 'aix', 'cloudabi') valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc', - 'ppc64', 'x32','x64', 'x86', 'x86_64', 's390', 's390x') + 'ppc64', 'x32','x64', 'x86', 'x86_64', 's390x') valid_arm_float_abi = ('soft', 'softfp', 'hard') valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon') valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx') @@ -867,7 +867,6 @@ def host_arch_cc(): '__PPC64__' : 'ppc64', '__PPC__' : 'ppc64', '__x86_64__' : 'x64', - '__s390__' : 's390', '__s390x__' : 's390x', } @@ -876,8 +875,7 @@ def host_arch_cc(): for i in matchup: if i in k and k[i] != '0': rtn = matchup[i] - if rtn != 's390': - break + break if rtn == 'mipsel' and '_LP64' in k: rtn = 'mips64el' -- cgit v1.2.3