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 --- deps/openssl/openssl-cl_asm.gypi | 2 -- deps/openssl/openssl-cl_asm_avx2.gypi | 2 -- deps/openssl/openssl-cl_no_asm.gypi | 2 -- deps/openssl/openssl_asm.gypi | 2 -- deps/openssl/openssl_asm_avx2.gypi | 2 -- deps/openssl/openssl_no_asm.gypi | 2 -- 6 files changed, 12 deletions(-) (limited to 'deps/openssl') diff --git a/deps/openssl/openssl-cl_asm.gypi b/deps/openssl/openssl-cl_asm.gypi index 2d4cb4aa48..50a17a9054 100644 --- a/deps/openssl/openssl-cl_asm.gypi +++ b/deps/openssl/openssl-cl_asm.gypi @@ -10,8 +10,6 @@ 'includes': ['config/archs/linux-ppc64le/asm/openssl-cl.gypi'], }, 'target_arch=="ppc64" and OS=="linux"', { 'includes': ['config/archs/linux-ppc64/asm/openssl-cl.gypi'], - }, 'target_arch=="s390" and OS=="linux"', { - 'includes': ['config/archs/linux32-s390x/asm/openssl-cl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/asm/openssl-cl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { diff --git a/deps/openssl/openssl-cl_asm_avx2.gypi b/deps/openssl/openssl-cl_asm_avx2.gypi index a118416c1a..21d21583df 100644 --- a/deps/openssl/openssl-cl_asm_avx2.gypi +++ b/deps/openssl/openssl-cl_asm_avx2.gypi @@ -10,8 +10,6 @@ 'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl-cl.gypi'], }, 'target_arch=="ppc64" and OS=="linux"', { 'includes': ['config/archs/linux-ppc64/asm_avx2/openssl-cl.gypi'], - }, 'target_arch=="s390" and OS=="linux"', { - 'includes': ['config/archs/linux32-s390x/asm_avx2/openssl-cl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { diff --git a/deps/openssl/openssl-cl_no_asm.gypi b/deps/openssl/openssl-cl_no_asm.gypi index d85adb3110..bb9e55de91 100644 --- a/deps/openssl/openssl-cl_no_asm.gypi +++ b/deps/openssl/openssl-cl_no_asm.gypi @@ -10,8 +10,6 @@ 'includes': ['config/archs/linux-ppc64le/no-asm/openssl-cl.gypi'], }, 'target_arch=="ppc64" and OS=="linux"', { 'includes': ['config/archs/linux-ppc64/no-asm/openssl-cl.gypi'], - }, 'target_arch=="s390" and OS=="linux"', { - 'includes': ['config/archs/linux32-s390x/no-asm/openssl-cl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/no-asm/openssl-cl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { diff --git a/deps/openssl/openssl_asm.gypi b/deps/openssl/openssl_asm.gypi index 85e5fd3a78..3f14419dc3 100644 --- a/deps/openssl/openssl_asm.gypi +++ b/deps/openssl/openssl_asm.gypi @@ -10,8 +10,6 @@ 'includes': ['config/archs/linux-ppc64le/asm/openssl.gypi'], }, 'target_arch=="ppc64" and OS=="linux"', { 'includes': ['config/archs/linux-ppc64/asm/openssl.gypi'], - }, 'target_arch=="s390" and OS=="linux"', { - 'includes': ['config/archs/linux32-s390x/asm/openssl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/asm/openssl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { diff --git a/deps/openssl/openssl_asm_avx2.gypi b/deps/openssl/openssl_asm_avx2.gypi index a3b853b89a..983a89aef7 100644 --- a/deps/openssl/openssl_asm_avx2.gypi +++ b/deps/openssl/openssl_asm_avx2.gypi @@ -10,8 +10,6 @@ 'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl.gypi'], }, 'target_arch=="ppc64" and OS=="linux"', { 'includes': ['config/archs/linux-ppc64/asm_avx2/openssl.gypi'], - }, 'target_arch=="s390" and OS=="linux"', { - 'includes': ['config/archs/linux32-s390x/asm_avx2/openssl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/asm_avx2/openssl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { diff --git a/deps/openssl/openssl_no_asm.gypi b/deps/openssl/openssl_no_asm.gypi index bf0fe158cc..8eb61d9703 100644 --- a/deps/openssl/openssl_no_asm.gypi +++ b/deps/openssl/openssl_no_asm.gypi @@ -11,8 +11,6 @@ 'includes': ['config/archs/linux-ppc64le/no-asm/openssl.gypi'], }, 'target_arch=="ppc64" and OS=="linux"', { 'includes': ['config/archs/linux-ppc64/no-asm/openssl.gypi'], - }, 'target_arch=="s390" and OS=="linux"', { - 'includes': ['config/archs/linux32-s390x/no-asm/openssl.gypi'], }, 'target_arch=="s390x" and OS=="linux"', { 'includes': ['config/archs/linux64-s390x/no-asm/openssl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { -- cgit v1.2.3