Skip to content

Commit 6f96526

Browse files
targostargos
committed
tools: update V8 gypfiles for 13.0
Refs: v8/v8@568f50d Refs: v8/v8@6437539 PR-URL: #55014 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
1 parent 52d3944 commit 6f96526

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,
@@ -437,9 +428,6 @@
437428
['v8_disable_write_barriers==1', {
438429
'defines': ['V8_DISABLE_WRITE_BARRIERS',],
439430
}],
440-
['v8_enable_third_party_heap==1', {
441-
'defines': ['V8_ENABLE_THIRD_PARTY_HEAP',],
442-
}],
443431
['v8_enable_atomic_object_field_writes==1', {
444432
'defines': ['V8_ATOMIC_OBJECT_FIELD_WRITES',],
445433
}],

‎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
@@ -368,11 +368,6 @@
368368
'<(V8_ROOT)/src/builtins/mips64/builtins-mips64.cc',
369369
],
370370
}],
371-
['v8_target_arch=="ppc"', {
372-
'sources': [
373-
'<(V8_ROOT)/src/builtins/ppc/builtins-ppc.cc',
374-
],
375-
}],
376371
['v8_target_arch=="ppc64"', {
377372
'sources': [
378373
'<(V8_ROOT)/src/builtins/ppc/builtins-ppc.cc',
@@ -782,11 +777,6 @@
782777
}],
783778
],
784779
}],
785-
['v8_target_arch=="ppc"', {
786-
'sources': [
787-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"ppc\\".*?sources \\+= ")',
788-
],
789-
}],
790780
['v8_target_arch=="ppc64"', {
791781
'sources': [
792782
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"ppc64\\".*?sources \\+= ")',
@@ -870,11 +860,6 @@
870860
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"mips64\\".*?v8_compiler_sources \\+= ")',
871861
],
872862
}],
873-
['v8_target_arch=="ppc"', {
874-
'sources': [
875-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"ppc\\".*?v8_compiler_sources \\+= ")',
876-
],
877-
}],
878863
['v8_target_arch=="ppc64"', {
879864
'sources': [
880865
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"ppc64\\".*?v8_compiler_sources \\+= ")',
@@ -1092,13 +1077,6 @@
10921077
'<(V8_ROOT)/src/wasm/fuzzing/random-module-generation.cc',
10931078
],
10941079
}],
1095-
['v8_enable_third_party_heap==1', {
1096-
# TODO(targos): add values from v8_third_party_heap_files to sources
1097-
}, {
1098-
'sources': [
1099-
'<(V8_ROOT)/src/heap/third-party/heap-api-stub.cc',
1100-
],
1101-
}],
11021080
['v8_enable_heap_snapshot_verify==1', {
11031081
'sources': [
11041082
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_heap_snapshot_verify.*?sources \\+= ")',
@@ -1180,11 +1158,6 @@
11801158
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"mips64\\".*?sources \\+= ")',
11811159
],
11821160
}],
1183-
['v8_target_arch=="ppc"', {
1184-
'sources': [
1185-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"ppc\\".*?sources \\+= ")',
1186-
],
1187-
}],
11881161
['v8_target_arch=="ppc64"', {
11891162
'sources': [
11901163
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"ppc64\\".*?sources \\+= ")',
@@ -1293,12 +1266,9 @@
12931266
['v8_postmortem_support', {
12941267
'dependencies': ['postmortem-metadata#target'],
12951268
}],
1296-
['v8_enable_third_party_heap', {
1297-
# TODO(targos): add values from v8_third_party_heap_libs to link_settings.libraries
1298-
}],
12991269
# Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
13001270
# to implement atomic memory access
1301-
['v8_current_cpu in ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', {
1271+
['v8_current_cpu in ["mips64", "mips64el", "arm", "riscv64", "loong64"]', {
13021272
'link_settings': {
13031273
'libraries': ['-latomic', ],
13041274
},

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy