From 017661768a00d11d07a3004b83fbb2b45318b5fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sun, 18 Oct 2020 22:17:38 +0200 Subject: [PATCH] tools: update V8 gypfiles for 8.9 PR-URL: https://github.com/nodejs/node/pull/37330 Reviewed-By: Jiawen Geng Reviewed-By: Colin Ihrig Reviewed-By: Rich Trott --- tools/v8_gypfiles/inspector.gypi | 2 + tools/v8_gypfiles/toolchain.gypi | 6 ++- tools/v8_gypfiles/v8.gyp | 66 +++++++++++++++++++------------- 3 files changed, 47 insertions(+), 27 deletions(-) diff --git a/tools/v8_gypfiles/inspector.gypi b/tools/v8_gypfiles/inspector.gypi index 75a876ff763814..f8f9a1c1b7a392 100644 --- a/tools/v8_gypfiles/inspector.gypi +++ b/tools/v8_gypfiles/inspector.gypi @@ -73,6 +73,8 @@ '<(V8_ROOT)/src/inspector/v8-debugger.h', '<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.cc', '<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.h', + '<(V8_ROOT)/src/inspector/v8-debugger-id.cc', + '<(V8_ROOT)/src/inspector/v8-debugger-id.h', '<(V8_ROOT)/src/inspector/v8-debugger-script.cc', '<(V8_ROOT)/src/inspector/v8-debugger-script.h', '<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.cc', diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi index 4b75f865369239..165ba936e562d5 100644 --- a/tools/v8_gypfiles/toolchain.gypi +++ b/tools/v8_gypfiles/toolchain.gypi @@ -304,6 +304,9 @@ 'defines': [ 'V8_TARGET_ARCH_PPC64', ], + 'cflags': [ + '-ffp-contract=off', + ], }], ['v8_host_byteorder=="little"', { 'defines': [ @@ -1341,12 +1344,13 @@ 4324, # Padding structure due to alignment. # 4351, # [refack] Old issue with array init. 4355, # 'this' used in base member initializer list + 4506, # Benign "no definition for inline function" 4661, # no suitable definition provided for explicit template instantiation request 4701, # Potentially uninitialized local variable. 4702, # Unreachable code. 4703, # Potentially uninitialized local pointer variable. 4709, # Comma operator within array index expr (bugged). - # 4714, # Function marked forceinline not inlined. + 4714, # Function marked forceinline not inlined. 4715, # Not all control paths return a value. (see https://crbug.com/v8/7658) 4718, # Recursive call has no side-effect. 4723, # https://crbug.com/v8/7771 diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 071540524bcfeb..9abbcc0289d9af 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -64,26 +64,24 @@ '<@(torque_files)', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/bit-fields.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtin-definitions.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/interface-descriptors.inc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/factory.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/factory.inc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/field-offsets.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-verifiers.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-verifiers.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/enum-verifiers.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/objects-printer.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/objects-body-descriptors-inl.inc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-debug-readers.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-debug-readers.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/exported-macros-assembler.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/exported-macros-assembler.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/csa-types.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/instance-types.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/runtime-macros.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/runtime-macros.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-forward-declarations.h', + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/bit-fields.h", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtin-definitions.h", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/interface-descriptors.inc", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/factory.cc", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/factory.inc", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/field-offsets.h", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-verifiers.cc", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-verifiers.h", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/enum-verifiers.cc", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/objects-printer.cc", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/objects-body-descriptors-inl.inc", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-debug-readers.cc", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-debug-readers.h", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/exported-macros-assembler.cc", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/exported-macros-assembler.h", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/csa-types.h", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/instance-types.h", + "<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-forward-declarations.h", '<@(torque_outputs_csa_cc)', '<@(torque_outputs_csa_h)', '<@(torque_outputs_inl_inc)', @@ -92,9 +90,9 @@ ], 'action': [ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)', - '<@(torque_files_without_v8_root)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated', - '-v8-root', '<(V8_ROOT)' + '-v8-root', '<(V8_ROOT)', + '<@(torque_files_without_v8_root)', ], }, ], @@ -166,7 +164,6 @@ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-verifiers.h', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/factory.cc', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/objects-printer.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/runtime-macros.cc', ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)', @@ -1092,6 +1089,8 @@ '<(V8_ROOT)/src/libplatform/delayed-task-queue.h', '<(V8_ROOT)/src/libplatform/task-queue.cc', '<(V8_ROOT)/src/libplatform/task-queue.h', + '<(V8_ROOT)/src/libplatform/tracing/recorder-default.cc', + '<(V8_ROOT)/src/libplatform/tracing/recorder.h', '<(V8_ROOT)/src/libplatform/tracing/trace-buffer.cc', '<(V8_ROOT)/src/libplatform/tracing/trace-buffer.h', '<(V8_ROOT)/src/libplatform/tracing/trace-config.cc', @@ -1112,10 +1111,17 @@ }, 'defines': ['BUILDING_V8_PLATFORM_SHARED'], }], - ['v8_use_perfetto', { + ['v8_use_perfetto==1', { + 'sources!': [ + '<(V8_ROOT)/base/trace_event/common/trace_event_common.h', + '<(V8_ROOT)/src/libplatform/tracing/recorder-default.cc', + '<(V8_ROOT)/src/libplatform/tracing/trace-buffer.cc', + '<(V8_ROOT)/src/libplatform/tracing/trace-buffer.h', + '<(V8_ROOT)/src/libplatform/tracing/trace-object.cc', + '<(V8_ROOT)/src/libplatform/tracing/trace-writer.cc', + '<(V8_ROOT)/src/libplatform/tracing/trace-writer.h', + ], 'sources': [ - '<(V8_ROOT)/src/libplatform/tracing/json-trace-event-listener.cc', - '<(V8_ROOT)/src/libplatform/tracing/json-trace-event-listener.h', '<(V8_ROOT)/src/libplatform/tracing/trace-event-listener.cc', '<(V8_ROOT)/src/libplatform/tracing/trace-event-listener.h', ], @@ -1124,6 +1130,14 @@ '<(V8_ROOT)/third_party/perfetto/protos/perfetto/trace:lite', ], }], + ['v8_use_perfetto==0 and is_win', { + 'sources!': [ + '<(V8_ROOT)/src/libplatform/tracing/recorder-default.cc', + ], + 'sources': [ + '<(V8_ROOT)/src/libplatform/tracing/recorder-win.cc', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [