Skip to content

Commit ca4bd30

Browse files
targosnodejs-github-bot
targos
authored and
nodejs-github-bot
committedMar 31, 2023
tools: update V8 gypfiles for 11.0
PR-URL: #47251 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Richard Lau <rlau@redhat.com>
·
v23.10.0v20.0.0
1 parent 7eb0ac3 commit ca4bd30

File tree

2 files changed

+84
-31
lines changed

2 files changed

+84
-31
lines changed
 

‎tools/v8_gypfiles/inspector.gypi

+2
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
'<(V8_ROOT)/src/inspector/v8-debugger.h',
7272
'<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.cc',
7373
'<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.h',
74+
'<(V8_ROOT)/src/inspector/v8-debugger-barrier.cc',
75+
'<(V8_ROOT)/src/inspector/v8-debugger-barrier.h',
7476
'<(V8_ROOT)/src/inspector/v8-debugger-id.cc',
7577
'<(V8_ROOT)/src/inspector/v8-debugger-id.h',
7678
'<(V8_ROOT)/src/inspector/v8-debugger-script.cc',

‎tools/v8_gypfiles/v8.gyp

+82-31
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
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': [
25-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources = ")',
26-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_source_set.\\"v8_turboshaft.*?sources = ")',
27-
],
24+
'v8_compiler_sources': ['<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources = ")'],
2825
'conditions': [
2926
['v8_enable_i18n_support==1', {
3027
'torque_files': [
@@ -542,6 +539,18 @@
542539
'sources': [
543540
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_maglev.*?sources \\+= ")',
544541
],
542+
'conditions': [
543+
['v8_target_arch=="arm64"', {
544+
'sources': [
545+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_maglev.*?v8_current_cpu == \\"arm64\\".*?sources \\+= ")',
546+
],
547+
}],
548+
['v8_target_arch=="x64"', {
549+
'sources': [
550+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_maglev.*?v8_current_cpu == \\"x64\\".*?sources \\+= ")',
551+
],
552+
}],
553+
],
545554
}],
546555
['v8_enable_webassembly==1', {
547556
'sources': [
@@ -570,29 +579,29 @@
570579
}],
571580
['v8_target_arch=="ia32"', {
572581
'sources': [
573-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"x86\\".*?sources \\+= ")',
582+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"x86\\".*?sources \\+= ")',
574583
],
575584
}],
576585
['v8_target_arch=="x64"', {
577586
'sources': [
578-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"x64\\".*?sources \\+= ")',
587+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"x64\\".*?sources \\+= ")',
579588
],
580589
'conditions': [
581590
['OS=="win"', {
582591
'sources': [
583-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"x64\\".*?is_win.*?sources \\+= ")',
592+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"x64\\".*?is_win.*?sources \\+= ")',
584593
],
585594
}],
586595
['v8_enable_webassembly==1', {
587596
'conditions': [
588597
['OS=="linux" or OS=="mac" or OS=="ios" or OS=="freebsd"', {
589598
'sources': [
590-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"x64\\".*?v8_enable_webassembly.*?is_linux.*?sources \\+= ")',
599+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"x64\\".*?v8_enable_webassembly.*?is_linux.*?sources \\+= ")',
591600
],
592601
}],
593602
['OS=="win"', {
594603
'sources': [
595-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"x64\\".*?v8_enable_webassembly.*?is_win.*?sources \\+= ")',
604+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"x64\\".*?v8_enable_webassembly.*?is_win.*?sources \\+= ")',
596605
],
597606
}],
598607
],
@@ -601,17 +610,17 @@
601610
}],
602611
['v8_target_arch=="arm"', {
603612
'sources': [
604-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"arm\\".*?sources \\+= ")',
613+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"arm\\".*?sources \\+= ")',
605614
],
606615
}],
607616
['v8_target_arch=="arm64"', {
608617
'sources': [
609-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"arm64\\".*?sources \\+= ")',
618+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"arm64\\".*?sources \\+= ")',
610619
],
611620
'conditions': [
612621
['v8_control_flow_integrity==1', {
613622
'sources': [
614-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"arm64\\".*?v8_control_flow_integrity.*?sources \\+= ")',
623+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"arm64\\".*?v8_control_flow_integrity.*?sources \\+= ")',
615624
],
616625
}],
617626
['v8_enable_webassembly==1', {
@@ -637,32 +646,32 @@
637646
}],
638647
['v8_target_arch=="mips64" or v8_target_arch=="mips64el"', {
639648
'sources': [
640-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"mips64\\".*?sources \\+= ")',
649+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"mips64\\".*?sources \\+= ")',
641650
],
642651
}],
643652
['v8_target_arch=="ppc"', {
644653
'sources': [
645-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"ppc\\".*?sources \\+= ")',
654+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"ppc\\".*?sources \\+= ")',
646655
],
647656
}],
648657
['v8_target_arch=="ppc64"', {
649658
'sources': [
650-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"ppc64\\".*?sources \\+= ")',
659+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"ppc64\\".*?sources \\+= ")',
651660
],
652661
}],
653662
['v8_target_arch=="s390x"', {
654663
'sources': [
655-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"s390\\".*?sources \\+= ")',
664+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"s390\\".*?sources \\+= ")',
656665
],
657666
}],
658667
['v8_target_arch=="riscv64"', {
659668
'sources': [
660-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"riscv64\\".*?sources \\+= ")',
669+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"riscv64\\".*?sources \\+= ")',
661670
],
662671
}],
663672
['v8_target_arch=="loong64"', {
664673
'sources': [
665-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_current_cpu == \\"loong64\\".*?sources \\+= ")',
674+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_header_set.\\"v8_internal_headers\\".*?v8_enable_i18n_support.*?v8_current_cpu == \\"loong64\\".*?sources \\+= ")',
666675
],
667676
}],
668677
],
@@ -705,6 +714,7 @@
705714
'v8_base_without_compiler',
706715
'v8_libbase',
707716
'v8_shared_internal_headers',
717+
'v8_turboshaft',
708718
],
709719
'sources': ['<@(v8_compiler_sources)'],
710720
'conditions': [
@@ -718,6 +728,33 @@
718728
}],
719729
],
720730
}, # v8_compiler
731+
{
732+
'target_name': 'v8_turboshaft',
733+
'type': 'static_library',
734+
'toolsets': ['host', 'target'],
735+
'dependencies': [
736+
'generate_bytecode_builtins_list',
737+
'run_torque',
738+
'v8_internal_headers',
739+
'v8_maybe_icu',
740+
'v8_base_without_compiler',
741+
'v8_libbase',
742+
'v8_shared_internal_headers',
743+
],
744+
'sources': [
745+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_source_set.\\"v8_turboshaft.*?sources = ")',
746+
],
747+
'conditions': [
748+
['OS=="win"', {
749+
'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h',
750+
'msvs_precompiled_source': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.cc',
751+
'sources': [
752+
'<(_msvs_precompiled_header)',
753+
'<(_msvs_precompiled_source)',
754+
],
755+
}],
756+
],
757+
}, # v8_turboshaft
721758
{
722759
'target_name': 'v8_compiler_for_mksnapshot',
723760
'type': 'none',
@@ -796,6 +833,18 @@
796833
'sources': [
797834
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_maglev.*?sources \\+= ")',
798835
],
836+
'conditions': [
837+
['v8_target_arch=="arm64"', {
838+
'sources': [
839+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_base_without_compiler.*?v8_enable_maglev.*?v8_current_cpu == \\"arm64\\".*?sources \\+= ")',
840+
],
841+
}],
842+
['v8_target_arch=="x64"', {
843+
'sources': [
844+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_base_without_compiler.*?v8_enable_maglev.*?v8_current_cpu == \\"x64\\".*?sources \\+= ")',
845+
],
846+
}],
847+
],
799848
}],
800849
['v8_enable_webassembly==1', {
801850
'sources': [
@@ -809,29 +858,29 @@
809858
}],
810859
['v8_target_arch=="ia32"', {
811860
'sources': [
812-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"x86.*?sources \\+= ")',
861+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"x86.*?sources \\+= ")',
813862
],
814863
}],
815864
['v8_target_arch=="x64"', {
816865
'sources': [
817-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"x64\\".*?sources \\+= ")',
866+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"x64\\".*?sources \\+= ")',
818867
],
819868
'conditions': [
820869
['OS=="win"', {
821870
'sources': [
822-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"x64\\".*?is_win.*?sources \\+= ")',
871+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"x64\\".*?is_win.*?sources \\+= ")',
823872
],
824873
}],
825874
['v8_enable_webassembly==1', {
826875
'conditions': [
827876
['OS=="linux" or OS=="mac" or OS=="ios" or OS=="freebsd"', {
828877
'sources': [
829-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"x64\\".*?v8_enable_webassembly.*?is_linux.*?sources \\+= ")',
878+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"x64\\".*?v8_enable_webassembly.*?is_linux.*?sources \\+= ")',
830879
],
831880
}],
832881
['OS=="win"', {
833882
'sources': [
834-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"x64\\".*?v8_enable_webassembly.*?is_win.*?sources \\+= ")',
883+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"x64\\".*?v8_enable_webassembly.*?is_win.*?sources \\+= ")',
835884
],
836885
}],
837886
],
@@ -840,12 +889,12 @@
840889
}],
841890
['v8_target_arch=="arm"', {
842891
'sources': [
843-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"arm\\".*?sources \\+= ")',
892+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"arm\\".*?sources \\+= ")',
844893
],
845894
}],
846895
['v8_target_arch=="arm64"', {
847896
'sources': [
848-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"arm64\\".*?sources \\+= ")',
897+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"arm64\\".*?sources \\+= ")',
849898
],
850899
'conditions': [
851900
['v8_enable_webassembly==1', {
@@ -880,32 +929,32 @@
880929
}],
881930
['v8_target_arch=="mips64" or v8_target_arch=="mips64el"', {
882931
'sources': [
883-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"mips64\\".*?sources \\+= ")',
932+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"mips64\\".*?sources \\+= ")',
884933
],
885934
}],
886935
['v8_target_arch=="ppc"', {
887936
'sources': [
888-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"ppc\\".*?sources \\+= ")',
937+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"ppc\\".*?sources \\+= ")',
889938
],
890939
}],
891940
['v8_target_arch=="ppc64"', {
892941
'sources': [
893-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"ppc64\\".*?sources \\+= ")',
942+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"ppc64\\".*?sources \\+= ")',
894943
],
895944
}],
896945
['v8_target_arch=="s390x"', {
897946
'sources': [
898-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"s390\\".*?sources \\+= ")',
947+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"s390\\".*?sources \\+= ")',
899948
],
900949
}],
901950
['v8_target_arch=="riscv64"', {
902951
'sources': [
903-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"riscv64\\".*?sources \\+= ")',
952+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"riscv64\\".*?sources \\+= ")',
904953
],
905954
}],
906955
['v8_target_arch=="loong64"', {
907956
'sources': [
908-
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"loong64\\".*?sources \\+= ")',
957+
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"loong64\\".*?sources \\+= ")',
909958
],
910959
}],
911960
['OS=="win"', {
@@ -987,6 +1036,7 @@
9871036
'dependencies': [
9881037
'v8_base_without_compiler',
9891038
'v8_compiler',
1039+
'v8_turboshaft',
9901040
],
9911041
}, # v8_base
9921042
{
@@ -1424,6 +1474,7 @@
14241474
'v8_libbase',
14251475
'v8_libplatform',
14261476
'v8_maybe_icu',
1477+
'v8_turboshaft',
14271478
# "build/win:default_exe_manifest",
14281479
],
14291480
'sources': [

0 commit comments

Comments
 (0)
Please sign in to comment.