diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/v8_gypfiles/broken/standalone.gypi | 2 | ||||
-rw-r--r-- | tools/v8_gypfiles/toolchain.gypi | 14 | ||||
-rw-r--r-- | tools/v8_gypfiles/v8.gyp | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/tools/v8_gypfiles/broken/standalone.gypi b/tools/v8_gypfiles/broken/standalone.gypi index 2a41237a60..f01b5975fc 100644 --- a/tools/v8_gypfiles/broken/standalone.gypi +++ b/tools/v8_gypfiles/broken/standalone.gypi @@ -165,7 +165,7 @@ }, { 'gomadir': '<!(/bin/echo -n ${HOME}/goma)', }], - ['host_arch!="ppc" and host_arch!="ppc64" and host_arch!="ppc64le" and host_arch!="s390" and host_arch!="s390x"', { + ['host_arch!="ppc" and host_arch!="ppc64" and host_arch!="ppc64le" and host_arch!="s390x"', { 'host_clang%': 1, }, { 'host_clang%': 0, diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi index c37c5b0c56..264b3e478e 100644 --- a/tools/v8_gypfiles/toolchain.gypi +++ b/tools/v8_gypfiles/toolchain.gypi @@ -140,7 +140,7 @@ 'conditions': [ ['host_arch=="ia32" or host_arch=="x64" or \ host_arch=="ppc" or host_arch=="ppc64" or \ - host_arch=="s390" or host_arch=="s390x" or \ + host_arch=="s390x" or \ clang==1', { 'variables': { 'host_cxx_is_biarch%': 1, @@ -151,7 +151,7 @@ }, }], ['target_arch=="ia32" or target_arch=="x64" or \ - target_arch=="ppc" or target_arch=="ppc64" or target_arch=="s390" or \ + target_arch=="ppc" or target_arch=="ppc64" or \ target_arch=="s390x" or clang==1', { 'variables': { 'target_cxx_is_biarch%': 1, @@ -302,7 +302,7 @@ 'V8_TARGET_ARCH_ARM64', ], }], - ['v8_target_arch=="s390" or v8_target_arch=="s390x"', { + ['v8_target_arch=="s390x"', { 'defines': [ 'V8_TARGET_ARCH_S390', ], @@ -320,7 +320,7 @@ 'cflags': [ '-march=z196' ], }], ], - }], # s390 + }], # s390x ['v8_target_arch=="ppc" or v8_target_arch=="ppc64"', { 'defines': [ 'V8_TARGET_ARCH_PPC', @@ -1045,13 +1045,13 @@ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ (v8_target_arch=="arm" or v8_target_arch=="ia32" or \ v8_target_arch=="mips" or v8_target_arch=="mipsel" or \ - v8_target_arch=="ppc" or v8_target_arch=="s390")', { + v8_target_arch=="ppc")', { 'target_conditions': [ ['_toolset=="host"', { 'conditions': [ ['host_cxx_is_biarch==1', { 'conditions': [ - ['host_arch=="s390" or host_arch=="s390x"', { + ['host_arch=="s390x"', { 'cflags': [ '-m31' ], 'ldflags': [ '-m31' ] },{ @@ -1069,7 +1069,7 @@ 'conditions': [ ['target_cxx_is_biarch==1', { 'conditions': [ - ['host_arch=="s390" or host_arch=="s390x"', { + ['host_arch=="s390x"', { 'cflags': [ '-m31' ], 'ldflags': [ '-m31' ] },{ diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index f0a6aeb69e..37364adc11 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -653,7 +653,7 @@ '<(V8_ROOT)/src/builtins/ppc/builtins-ppc.cc', ], }], - ['v8_target_arch=="s390" or v8_target_arch=="s390x"', { + ['v8_target_arch=="s390x"', { 'sources': [ '<(V8_ROOT)/src/builtins/s390/builtins-s390.cc', ], @@ -2187,7 +2187,7 @@ '<(V8_ROOT)/src/wasm/baseline/ppc/liftoff-assembler-ppc.h', ], }], - ['v8_target_arch=="s390" or v8_target_arch=="s390x"', { + ['v8_target_arch=="s390x"', { 'sources': [ ### gcmole(arch:s390) ### '<(V8_ROOT)/src/compiler/backend/s390/code-generator-s390.cc', '<(V8_ROOT)/src/compiler/backend/s390/instruction-codes-s390.h', @@ -2298,7 +2298,7 @@ }], # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library # to implement atomic memory access - ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "ppc64", "s390", "s390x"]', { + ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "ppc64", "s390x"]', { 'link_settings': { 'libraries': ['-latomic', ], }, |