Skip to content

Commit 0db50a9

Browse files
targosnodejs-github-bot
targos
authored and
nodejs-github-bot
committed
tools: update V8 gypfiles for 13.0
Refs: v8/v8@568f50d Refs: v8/v8@6437539
1 parent 1a0819e commit 0db50a9

File tree

3 files changed

+18
-83
lines changed

3 files changed

+18
-83
lines changed

‎tools/v8_gypfiles/features.gypi‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,6 @@
216216
# Enable lazy source positions by default.
217217
'v8_enable_lazy_source_positions%': 1,
218218

219-
# Enable third party HEAP library
220-
'v8_enable_third_party_heap%': 0,
221-
222-
# Libraries used by third party heap
223-
'v8_third_party_heap_libs%': [],
224-
225-
# Source code used by third party heap
226-
'v8_third_party_heap_files%': [],
227-
228219
# Disable write barriers when GCs are non-incremental and
229220
# heap has single generation.
230221
'v8_disable_write_barriers%': 0,
@@ -434,9 +425,6 @@
434425
['v8_disable_write_barriers==1', {
435426
'defines': ['V8_DISABLE_WRITE_BARRIERS',],
436427
}],
437-
['v8_enable_third_party_heap==1', {
438-
'defines': ['V8_ENABLE_THIRD_PARTY_HEAP',],
439-
}],
440428
['v8_enable_atomic_object_field_writes==1', {
441429
'defines': ['V8_ATOMIC_OBJECT_FIELD_WRITES',],
442430
}],

‎tools/v8_gypfiles/toolchain.gypi‎

Lines changed: 17 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
# [GYP] this needs to be outside of the top level 'variables'
102102
'conditions': [
103103
['host_arch=="ia32" or host_arch=="x64" or \
104-
host_arch=="ppc" or host_arch=="ppc64" or \
104+
host_arch=="ppc64" or \
105105
host_arch=="s390x" or \
106106
clang==1', {
107107
'variables': {
@@ -113,7 +113,7 @@
113113
},
114114
}],
115115
['target_arch=="ia32" or target_arch=="x64" or \
116-
target_arch=="ppc" or target_arch=="ppc64" or \
116+
target_arch=="ppc64" or \
117117
target_arch=="s390x" or clang==1', {
118118
'variables': {
119119
'target_cxx_is_biarch%': 1,
@@ -328,43 +328,24 @@
328328
}],
329329
],
330330
}], # s390x
331-
['v8_target_arch=="ppc" or v8_target_arch=="ppc64"', {
331+
['v8_target_arch=="ppc64"', {
332+
'defines': [
333+
'V8_TARGET_ARCH_PPC64',
334+
],
335+
'cflags': [
336+
'-ffp-contract=off',
337+
],
332338
'conditions': [
333-
['v8_target_arch=="ppc"', {
334-
'defines': [
335-
'V8_TARGET_ARCH_PPC',
336-
],
337-
}],
338-
['v8_target_arch=="ppc64"', {
339-
'defines': [
340-
'V8_TARGET_ARCH_PPC64',
341-
],
342-
'cflags': [
343-
'-ffp-contract=off',
344-
],
345-
}],
346-
['v8_host_byteorder=="little"', {
347-
'defines': [
348-
'V8_TARGET_ARCH_PPC_LE',
349-
],
339+
['OS=="aix" or OS=="os400"', {
340+
# Work around AIX ceil, trunc and round oddities.
341+
'cflags': [ '-mcpu=power5+ -mfprnd' ],
350342
}],
351-
['v8_host_byteorder=="big"', {
352-
'defines': [
353-
'V8_TARGET_ARCH_PPC_BE',
354-
],
355-
'conditions': [
356-
['OS=="aix" or OS=="os400"', {
357-
# Work around AIX ceil, trunc and round oddities.
358-
'cflags': [ '-mcpu=power5+ -mfprnd' ],
359-
}],
360-
['OS=="aix" or OS=="os400"', {
361-
# Work around AIX assembler popcntb bug.
362-
'cflags': [ '-mno-popcntb' ],
363-
}],
364-
],
343+
['OS=="aix" or OS=="os400"', {
344+
# Work around AIX assembler popcntb bug.
345+
'cflags': [ '-mno-popcntb' ],
365346
}],
366347
],
367-
}], # ppc
348+
}], # ppc64
368349
['v8_target_arch=="ia32"', {
369350
'defines': [
370351
'V8_TARGET_ARCH_IA32',
@@ -595,8 +576,7 @@
595576
}],
596577
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
597578
or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
598-
(v8_target_arch=="arm" or v8_target_arch=="ia32" or \
599-
v8_target_arch=="ppc")', {
579+
(v8_target_arch=="arm" or v8_target_arch=="ia32")', {
600580
'target_conditions': [
601581
['_toolset=="host"', {
602582
'conditions': [
@@ -679,9 +659,6 @@
679659
'__STDC_FORMAT_MACROS',
680660
'_ALL_SOURCE=1'],
681661
'conditions': [
682-
[ 'v8_target_arch=="ppc"', {
683-
'ldflags': [ '-Wl,-bmaxdata:0x60000000/dsa' ],
684-
}],
685662
[ 'v8_target_arch=="ppc64"', {
686663
'cflags': [ '-maix64', '-fdollars-in-identifiers', '-fno-extern-tls-init' ],
687664
'ldflags': [ '-maix64 -Wl,-bbigtoc' ],

‎tools/v8_gypfiles/v8.gyp‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -355,11 +355,6 @@
355355
'<(V8_ROOT)/src/builtins/mips64/builtins-mips64.cc',
356356
],
357357
}],
358-
['v8_target_arch=="ppc"', {
359-
'sources': [
360-
'<(V8_ROOT)/src/builtins/ppc/builtins-ppc.cc',
361-
],
362-
}],
363358
['v8_target_arch=="ppc64"', {
364359
'sources': [
365360
'<(V8_ROOT)/src/builtins/ppc/builtins-ppc.cc',
@@ -764,11 +759,6 @@
764759
}],
765760
],
766761
}],
767-
['v8_target_arch=="ppc"', {
768-
'sources': [
769-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"ppc\\".*?sources \\+= ")',
770-
],
771-
}],
772762
['v8_target_arch=="ppc64"', {
773763
'sources': [
774764
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"ppc64\\".*?sources \\+= ")',
@@ -852,11 +842,6 @@
852842
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"mips64\\".*?v8_compiler_sources \\+= ")',
853843
],
854844
}],
855-
['v8_target_arch=="ppc"', {
856-
'sources': [
857-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"ppc\\".*?v8_compiler_sources \\+= ")',
858-
],
859-
}],
860845
['v8_target_arch=="ppc64"', {
861846
'sources': [
862847
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"ppc64\\".*?v8_compiler_sources \\+= ")',
@@ -1069,13 +1054,6 @@
10691054
'<(V8_ROOT)/src/wasm/fuzzing/random-module-generation.cc',
10701055
],
10711056
}],
1072-
['v8_enable_third_party_heap==1', {
1073-
# TODO(targos): add values from v8_third_party_heap_files to sources
1074-
}, {
1075-
'sources': [
1076-
'<(V8_ROOT)/src/heap/third-party/heap-api-stub.cc',
1077-
],
1078-
}],
10791057
['v8_enable_heap_snapshot_verify==1', {
10801058
'sources': [
10811059
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_heap_snapshot_verify.*?sources \\+= ")',
@@ -1157,11 +1135,6 @@
11571135
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"mips64\\".*?sources \\+= ")',
11581136
],
11591137
}],
1160-
['v8_target_arch=="ppc"', {
1161-
'sources': [
1162-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"ppc\\".*?sources \\+= ")',
1163-
],
1164-
}],
11651138
['v8_target_arch=="ppc64"', {
11661139
'sources': [
11671140
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"ppc64\\".*?sources \\+= ")',
@@ -1265,12 +1238,9 @@
12651238
['v8_postmortem_support', {
12661239
'dependencies': ['postmortem-metadata#target'],
12671240
}],
1268-
['v8_enable_third_party_heap', {
1269-
# TODO(targos): add values from v8_third_party_heap_libs to link_settings.libraries
1270-
}],
12711241
# Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
12721242
# to implement atomic memory access
1273-
['v8_current_cpu in ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', {
1243+
['v8_current_cpu in ["mips64", "mips64el", "arm", "riscv64", "loong64"]', {
12741244
'link_settings': {
12751245
'libraries': ['-latomic', ],
12761246
},

0 commit comments

Comments
 (0)