diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi index 6e21dac6d70..52cb7163442 100644 --- a/tools/v8_gypfiles/features.gypi +++ b/tools/v8_gypfiles/features.gypi @@ -216,15 +216,6 @@ # Enable lazy source positions by default. 'v8_enable_lazy_source_positions%': 1, - # Enable third party HEAP library - 'v8_enable_third_party_heap%': 0, - - # Libaries used by third party heap - 'v8_third_party_heap_libs%': [], - - # Source code used by third party heap - 'v8_third_party_heap_files%': [], - # Disable write barriers when GCs are non-incremental and # heap has single generation. 'v8_disable_write_barriers%': 0, @@ -434,9 +425,6 @@ ['v8_disable_write_barriers==1', { 'defines': ['V8_DISABLE_WRITE_BARRIERS',], }], - ['v8_enable_third_party_heap==1', { - 'defines': ['V8_ENABLE_THIRD_PARTY_HEAP',], - }], ['v8_enable_atomic_object_field_writes==1', { 'defines': ['V8_ATOMIC_OBJECT_FIELD_WRITES',], }], diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi index e75ccf52a57..a5388783d9b 100644 --- a/tools/v8_gypfiles/toolchain.gypi +++ b/tools/v8_gypfiles/toolchain.gypi @@ -101,7 +101,7 @@ # [GYP] this needs to be outside of the top level 'variables' 'conditions': [ ['host_arch=="ia32" or host_arch=="x64" or \ - host_arch=="ppc" or host_arch=="ppc64" or \ + host_arch=="ppc64" or \ host_arch=="s390x" or \ clang==1', { 'variables': { @@ -113,7 +113,7 @@ }, }], ['target_arch=="ia32" or target_arch=="x64" or \ - target_arch=="ppc" or target_arch=="ppc64" or \ + target_arch=="ppc64" or \ target_arch=="s390x" or clang==1', { 'variables': { 'target_cxx_is_biarch%': 1, @@ -328,43 +328,24 @@ }], ], }], # s390x - ['v8_target_arch=="ppc" or v8_target_arch=="ppc64"', { + ['v8_target_arch=="ppc64"', { + 'defines': [ + 'V8_TARGET_ARCH_PPC64', + ], + 'cflags': [ + '-ffp-contract=off', + ], 'conditions': [ - ['v8_target_arch=="ppc"', { - 'defines': [ - 'V8_TARGET_ARCH_PPC', - ], - }], - ['v8_target_arch=="ppc64"', { - 'defines': [ - 'V8_TARGET_ARCH_PPC64', - ], - 'cflags': [ - '-ffp-contract=off', - ], - }], - ['v8_host_byteorder=="little"', { - 'defines': [ - 'V8_TARGET_ARCH_PPC_LE', - ], + ['OS=="aix" or OS=="os400"', { + # Work around AIX ceil, trunc and round oddities. + 'cflags': [ '-mcpu=power5+ -mfprnd' ], }], - ['v8_host_byteorder=="big"', { - 'defines': [ - 'V8_TARGET_ARCH_PPC_BE', - ], - 'conditions': [ - ['OS=="aix" or OS=="os400"', { - # Work around AIX ceil, trunc and round oddities. - 'cflags': [ '-mcpu=power5+ -mfprnd' ], - }], - ['OS=="aix" or OS=="os400"', { - # Work around AIX assembler popcntb bug. - 'cflags': [ '-mno-popcntb' ], - }], - ], + ['OS=="aix" or OS=="os400"', { + # Work around AIX assembler popcntb bug. + 'cflags': [ '-mno-popcntb' ], }], ], - }], # ppc + }], # ppc64 ['v8_target_arch=="ia32"', { 'defines': [ 'V8_TARGET_ARCH_IA32', @@ -595,8 +576,7 @@ }], ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ 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=="ppc")', { + (v8_target_arch=="arm" or v8_target_arch=="ia32")', { 'target_conditions': [ ['_toolset=="host"', { 'conditions': [ @@ -679,9 +659,6 @@ '__STDC_FORMAT_MACROS', '_ALL_SOURCE=1'], 'conditions': [ - [ 'v8_target_arch=="ppc"', { - 'ldflags': [ '-Wl,-bmaxdata:0x60000000/dsa' ], - }], [ 'v8_target_arch=="ppc64"', { 'cflags': [ '-maix64', '-fdollars-in-identifiers', '-fno-extern-tls-init' ], 'ldflags': [ '-maix64 -Wl,-bbigtoc' ], diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 03b83790a93..cefa0d1dfc1 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -355,11 +355,6 @@ '<(V8_ROOT)/src/builtins/mips64/builtins-mips64.cc', ], }], - ['v8_target_arch=="ppc"', { - 'sources': [ - '<(V8_ROOT)/src/builtins/ppc/builtins-ppc.cc', - ], - }], ['v8_target_arch=="ppc64"', { 'sources': [ '<(V8_ROOT)/src/builtins/ppc/builtins-ppc.cc', @@ -761,11 +756,6 @@ }], ], }], - ['v8_target_arch=="ppc"', { - 'sources': [ - '