Skip to content

Commit 123211c

Browse files
targostargos
committed
tools: update V8 gypfiles for 11.1
1 parent 45dc6a3 commit 123211c

File tree

3 files changed

+116
-35
lines changed

3 files changed

+116
-35
lines changed

‎tools/v8_gypfiles/features.gypi‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@
133133
# as per the --native-code-counters flag.
134134
'v8_enable_snapshot_native_code_counters%': 0,
135135

136+
# Use pre-generated static root pointer values from static-roots.h.
137+
'v8_enable_static_roots%': 0,
138+
136139
# Enable code-generation-time checking of types in the CodeStubAssembler.
137140
'v8_enable_verify_csa%': 0,
138141

@@ -168,10 +171,6 @@
168171
# Enables various testing features.
169172
'v8_enable_test_features%': 0,
170173

171-
# Enable the Maglev compiler.
172-
# Sets -dV8_ENABLE_MAGLEV
173-
'v8_enable_maglev%': 0,
174-
175174
# With post mortem support enabled, metadata is embedded into libv8 that
176175
# describes various parameters of the VM for use by debuggers. See
177176
# tools/gen-postmortem-metadata.py for details.
@@ -278,9 +277,19 @@
278277
# Sets --DV8_LITE_MODE.
279278
'v8_enable_lite_mode%': 0,
280279

280+
# Enable the Turbofan compiler.
281+
# Sets -dV8_ENABLE_TURBOFAN
282+
'v8_enable_turbofan%': 1,
283+
284+
# Enable the Maglev compiler.
285+
# Sets -dV8_ENABLE_MAGLEV
286+
'v8_enable_maglev%': 0,
287+
281288
# Include support for WebAssembly. If disabled, the 'WebAssembly' global
282289
# will not be available, and embedder APIs to generate WebAssembly modules
283-
# will fail.
290+
# will fail. Also, asm.js will not be translated to WebAssembly and will be
291+
# executed as standard JavaScript instead.
292+
# Sets -dV8_ENABLE_WEBASSEMBLY.
284293
'v8_enable_webassembly%': 1,
285294

286295
# Enable advanced BigInt algorithms, costing about 10-30 KiB binary size
@@ -428,6 +437,9 @@
428437
['v8_enable_cet_shadow_stack==1', {
429438
'defines': ['V8_ENABLE_CET_SHADOW_STACK',],
430439
}],
440+
['v8_enable_static_roots==1', {
441+
'defines': ['V8_STATIC_ROOTS',],
442+
}],
431443
['v8_use_zlib==1', {
432444
'defines': ['V8_USE_ZLIB',],
433445
}],
@@ -437,6 +449,9 @@
437449
['v8_enable_maglev==1', {
438450
'defines': ['V8_ENABLE_MAGLEV',],
439451
}],
452+
['v8_enable_turbofan==1', {
453+
'defines': ['V8_ENABLE_TURBOFAN',],
454+
}],
440455
['v8_enable_swiss_name_dictionary==1', {
441456
'defines': ['V8_ENABLE_SWISS_NAME_DICTIONARY',],
442457
}],

‎tools/v8_gypfiles/inspector.gypi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
'inspector_all_sources': [
4646
'<(V8_ROOT)/include/v8-inspector.h',
4747
'<(V8_ROOT)/include/v8-inspector-protocol.h',
48+
'<(V8_ROOT)/src/inspector/crc32.cc',
49+
'<(V8_ROOT)/src/inspector/crc32.h',
4850
'<(V8_ROOT)/src/inspector/custom-preview.cc',
4951
'<(V8_ROOT)/src/inspector/custom-preview.h',
5052
'<(V8_ROOT)/src/inspector/injected-script.cc',

‎tools/v8_gypfiles/v8.gyp‎

Lines changed: 94 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
'torque_outputs_inl_inc': ['<!@pymod_do_main(ForEachFormat "<(SHARED_INTERMEDIATE_DIR)/torque-generated/%s-inl.inc" <@(torque_files_replaced))'],
2222
'torque_outputs_cc': ['<!@pymod_do_main(ForEachFormat "<(SHARED_INTERMEDIATE_DIR)/torque-generated/%s.cc" <@(torque_files_replaced))'],
2323
'torque_outputs_inc': ['<!@pymod_do_main(ForEachFormat "<(SHARED_INTERMEDIATE_DIR)/torque-generated/%s.inc" <@(torque_files_replaced))'],
24-
'v8_compiler_sources': ['<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources = ")'],
2524
'conditions': [
2625
['v8_enable_i18n_support==1', {
2726
'torque_files': [
@@ -32,9 +31,6 @@
3231
'torque_files': [
3332
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "torque_files =.*?v8_enable_webassembly.*?torque_files \\+= ")',
3433
],
35-
'v8_compiler_sources': [
36-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_enable_webassembly.*?v8_compiler_sources \\+= ")',
37-
],
3834
}],
3935
],
4036
},
@@ -678,7 +674,67 @@
678674
},
679675
}, # v8_internal_headers
680676
{
681-
'target_name': 'v8_compiler_opt',
677+
'target_name': 'v8_compiler_sources',
678+
'type': 'none',
679+
'toolsets': ['host', 'target'],
680+
'direct_dependent_settings': {
681+
'sources': ['<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources = ")'],
682+
'conditions': [
683+
['v8_target_arch=="ia32"', {
684+
'sources': [
685+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"x86\\".*?v8_compiler_sources \\+= ")',
686+
],
687+
}],
688+
['v8_target_arch=="x64"', {
689+
'sources': [
690+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"x64\\".*?v8_compiler_sources \\+= ")',
691+
],
692+
}],
693+
['v8_target_arch=="arm"', {
694+
'sources': [
695+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"arm\\".*?v8_compiler_sources \\+= ")',
696+
],
697+
}],
698+
['v8_target_arch=="arm64"', {
699+
'sources': [
700+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"arm64\\".*?v8_compiler_sources \\+= ")',
701+
],
702+
}],
703+
['v8_target_arch=="mips64" or v8_target_arch=="mips64el"', {
704+
'sources': [
705+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"mips64\\".*?v8_compiler_sources \\+= ")',
706+
],
707+
}],
708+
['v8_target_arch=="ppc"', {
709+
'sources': [
710+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"ppc\\".*?v8_compiler_sources \\+= ")',
711+
],
712+
}],
713+
['v8_target_arch=="ppc64"', {
714+
'sources': [
715+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"ppc64\\".*?v8_compiler_sources \\+= ")',
716+
],
717+
}],
718+
['v8_target_arch=="s390x"', {
719+
'sources': [
720+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"s390x\\".*?v8_compiler_sources \\+= ")',
721+
],
722+
}],
723+
['v8_target_arch=="riscv64"', {
724+
'sources': [
725+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_current_cpu == \\"riscv64\\".*?v8_compiler_sources \\+= ")',
726+
],
727+
}],
728+
['v8_enable_webassembly==1', {
729+
'sources': [
730+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources =.*?v8_enable_webassembly.*?v8_compiler_sources \\+= ")',
731+
],
732+
}],
733+
],
734+
}
735+
}, # v8_compiler_sources
736+
{
737+
'target_name': 'v8_compiler_for_mksnapshot_source_set',
682738
'type': 'static_library',
683739
'toolsets': ['host', 'target'],
684740
'dependencies': [
@@ -690,7 +746,6 @@
690746
'v8_libbase',
691747
'v8_shared_internal_headers',
692748
],
693-
'sources': ['<@(v8_compiler_sources)'],
694749
'conditions': [
695750
['OS=="win"', {
696751
'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h',
@@ -700,8 +755,13 @@
700755
'<(_msvs_precompiled_source)',
701756
],
702757
}],
758+
['v8_enable_turbofan==1', {
759+
'dependencies': ['v8_compiler_sources'],
760+
}, {
761+
'sources': ['<(V8_ROOT)/src/compiler/turbofan-disabled.cc'],
762+
}],
703763
],
704-
}, # v8_compiler_opt
764+
}, # v8_compiler_for_mksnapshot_source_set
705765
{
706766
'target_name': 'v8_compiler',
707767
'type': 'static_library',
@@ -716,8 +776,12 @@
716776
'v8_shared_internal_headers',
717777
'v8_turboshaft',
718778
],
719-
'sources': ['<@(v8_compiler_sources)'],
720779
'conditions': [
780+
['v8_enable_turbofan==1', {
781+
'dependencies': ['v8_compiler_sources'],
782+
}, {
783+
'sources': ['<(V8_ROOT)/src/compiler/turbofan-disabled.cc'],
784+
}],
721785
['OS=="win"', {
722786
'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h',
723787
'msvs_precompiled_source': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.cc',
@@ -766,12 +830,12 @@
766830
'v8_maybe_icu',
767831
],
768832
'conditions': [
769-
['is_component_build and not v8_optimized_debug and v8_enable_fast_mksnapshot', {
833+
['(is_component_build and not v8_optimized_debug and v8_enable_fast_mksnapshot) or v8_enable_turbofan==0', {
770834
'dependencies': [
771-
'v8_compiler_opt',
835+
'v8_compiler_for_mksnapshot_source_set',
772836
],
773837
'export_dependent_settings': [
774-
'v8_compiler_opt',
838+
'v8_compiler_for_mksnapshot_source_set',
775839
],
776840
}, {
777841
'dependencies': [
@@ -1036,7 +1100,13 @@
10361100
'dependencies': [
10371101
'v8_base_without_compiler',
10381102
'v8_compiler',
1039-
'v8_turboshaft',
1103+
],
1104+
'conditions': [
1105+
['v8_enable_turbofan==1', {
1106+
'dependencies': [
1107+
'v8_turboshaft',
1108+
],
1109+
}],
10401110
],
10411111
}, # v8_base
10421112
{
@@ -1195,7 +1265,6 @@
11951265
'sources': [
11961266
'<(V8_ROOT)/src/base/debug/stack_trace_posix.cc',
11971267
'<(V8_ROOT)/src/base/platform/platform-darwin.cc',
1198-
'<(V8_ROOT)/src/base/platform/platform-macos.cc',
11991268
]
12001269
}],
12011270
['OS == "ios"', {
@@ -1287,11 +1356,6 @@
12871356
'<(V8_ROOT)/src/base/platform/platform-linux.cc'
12881357
],
12891358
}],
1290-
['_toolset=="host" and host_os=="mac"', {
1291-
'sources': [
1292-
'<(V8_ROOT)/src/base/platform/platform-macos.cc'
1293-
],
1294-
}],
12951359
['_toolset=="target"', {
12961360
'sources': [
12971361
'<(V8_ROOT)/src/base/platform/platform-qnx.cc'
@@ -1661,47 +1725,47 @@
16611725
'conditions': [
16621726
['_toolset == "host" and host_arch == "x64" or _toolset == "target" and target_arch=="x64"', {
16631727
'sources': [
1664-
'<(V8_ROOT)/src/heap/base/asm/x64/save_registers_asm.cc',
1728+
'<(V8_ROOT)/src/heap/base/asm/x64/push_registers_asm.cc',
16651729
],
16661730
}],
16671731
['_toolset == "host" and host_arch == "ia32" or _toolset == "target" and target_arch=="ia32"', {
16681732
'sources': [
1669-
'<(V8_ROOT)/src/heap/base/asm/ia32/save_registers_asm.cc',
1733+
'<(V8_ROOT)/src/heap/base/asm/ia32/push_registers_asm.cc',
16701734
],
16711735
}],
16721736
['_toolset == "host" and host_arch == "arm" or _toolset == "target" and target_arch=="arm"', {
16731737
'sources': [
1674-
'<(V8_ROOT)/src/heap/base/asm/arm/save_registers_asm.cc',
1738+
'<(V8_ROOT)/src/heap/base/asm/arm/push_registers_asm.cc',
16751739
],
16761740
}],
16771741
['_toolset == "host" and host_arch == "arm64" or _toolset == "target" and target_arch=="arm64"', {
16781742
'sources': [
1679-
'<(V8_ROOT)/src/heap/base/asm/arm64/save_registers_asm.cc',
1743+
'<(V8_ROOT)/src/heap/base/asm/arm64/push_registers_asm.cc',
16801744
],
16811745
}],
16821746
['_toolset == "host" and host_arch == "ppc64" or _toolset == "target" and target_arch=="ppc64"', {
16831747
'sources': [
1684-
'<(V8_ROOT)/src/heap/base/asm/ppc/save_registers_asm.cc',
1748+
'<(V8_ROOT)/src/heap/base/asm/ppc/push_registers_asm.cc',
16851749
],
16861750
}],
16871751
['_toolset == "host" and host_arch == "s390x" or _toolset == "target" and target_arch=="s390x"', {
16881752
'sources': [
1689-
'<(V8_ROOT)/src/heap/base/asm/s390/save_registers_asm.cc',
1753+
'<(V8_ROOT)/src/heap/base/asm/s390/push_registers_asm.cc',
16901754
],
16911755
}],
16921756
['_toolset == "host" and host_arch == "mips64" or _toolset == "target" and target_arch=="mips64" or _toolset == "host" and host_arch == "mips64el" or _toolset == "target" and target_arch=="mips64el"', {
16931757
'sources': [
1694-
'<(V8_ROOT)/src/heap/base/asm/mips64/save_registers_asm.cc',
1758+
'<(V8_ROOT)/src/heap/base/asm/mips64/push_registers_asm.cc',
16951759
],
16961760
}],
16971761
['_toolset == "host" and host_arch == "riscv64" or _toolset == "target" and target_arch=="riscv64"', {
16981762
'sources': [
1699-
'<(V8_ROOT)/src/heap/base/asm/riscv/save_registers_asm.cc',
1763+
'<(V8_ROOT)/src/heap/base/asm/riscv/push_registers_asm.cc',
17001764
],
17011765
}],
17021766
['_toolset == "host" and host_arch == "loong64" or _toolset == "target" and target_arch=="loong64"', {
17031767
'sources': [
1704-
'<(V8_ROOT)/src/heap/base/asm/loong64/save_registers_asm.cc',
1768+
'<(V8_ROOT)/src/heap/base/asm/loong64/push_registers_asm.cc',
17051769
],
17061770
}],
17071771
]
@@ -1710,17 +1774,17 @@
17101774
'conditions': [
17111775
['_toolset == "host" and host_arch == "x64" or _toolset == "target" and target_arch=="x64"', {
17121776
'sources': [
1713-
'<(V8_ROOT)/src/heap/base/asm/x64/save_registers_masm.asm',
1777+
'<(V8_ROOT)/src/heap/base/asm/x64/push_registers_masm.asm',
17141778
],
17151779
}],
17161780
['_toolset == "host" and host_arch == "ia32" or _toolset == "target" and target_arch=="ia32"', {
17171781
'sources': [
1718-
'<(V8_ROOT)/src/heap/base/asm/ia32/save_registers_masm.asm',
1782+
'<(V8_ROOT)/src/heap/base/asm/ia32/push_registers_masm.asm',
17191783
],
17201784
}],
17211785
['_toolset == "host" and host_arch == "arm64" or _toolset == "target" and target_arch=="arm64"', {
17221786
'sources': [
1723-
'<(V8_ROOT)/src/heap/base/asm/arm64/save_registers_masm.S',
1787+
'<(V8_ROOT)/src/heap/base/asm/arm64/push_registers_masm.S',
17241788
],
17251789
}],
17261790
],

0 commit comments

Comments
 (0)