Skip to content

Commit

Permalink
tools: update V8 gypfiles for 8.7
Browse files Browse the repository at this point in the history
PR-URL: nodejs#35700
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
  • Loading branch information
targos committed Nov 19, 2020
1 parent 685cb6e commit b7311fb
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 45 deletions.
6 changes: 0 additions & 6 deletions tools/v8_gypfiles/features.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,6 @@
# Sets -dV8_TRACE_FEEDBACK_UPDATES.
'v8_enable_trace_feedback_updates%': 0,

# Sets -dV8_CONCURRENT_MARKING
'v8_enable_concurrent_marking%': 1,

# Enables various testing features.
'v8_enable_test_features%': 0,

Expand Down Expand Up @@ -322,9 +319,6 @@
['v8_enable_third_party_heap==1', {
'defines': ['V8_ENABLE_THIRD_PARTY_HEAP',],
}],
['v8_enable_concurrent_marking==1', {
'defines': ['V8_CONCURRENT_MARKING',],
}],
['v8_enable_lazy_source_positions==1', {
'defines': ['V8_ENABLE_LAZY_SOURCE_POSITIONS',],
}],
Expand Down
10 changes: 1 addition & 9 deletions tools/v8_gypfiles/toolchain.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@
# For a shared library build, results in "libv8-<(soname_version).so".
'soname_version%': '',

# Allow to suppress the array bounds warning (default is no suppression).
'wno_array_bounds%': '',

# Override where to find binutils
'binutils_dir%': '',

Expand Down Expand Up @@ -141,7 +138,7 @@
'cflags': [ '-Werror', '-Wno-unknown-pragmas' ],
},{
'cflags!': [ '-Wall', '-Wextra' ],
'cflags': [ '-Wno-return-type' ],
'cflags': [ '-Wno-return-type', '-Wno-int-in-bool-context' ],
}],
['v8_target_arch=="arm"', {
'defines': [
Expand Down Expand Up @@ -1116,10 +1113,6 @@
'V8_ENABLE_FORCE_SLOW_PATH',
],
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
OS=="qnx" or OS=="aix"', {
'cflags': [ '-Woverloaded-virtual', '<(wno_array_bounds)', ],
}],
['OS=="linux" and v8_enable_backtrace==1', {
# Support for backtrace_symbols.
'ldflags': [ '-rdynamic' ],
Expand Down Expand Up @@ -1276,7 +1269,6 @@
'cflags': [
'-fdata-sections',
'-ffunction-sections',
'<(wno_array_bounds)',
],
'conditions': [
# Don't use -O3 with sanitizers.
Expand Down
68 changes: 38 additions & 30 deletions tools/v8_gypfiles/v8.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"<(V8_ROOT)/src/builtins/array-splice.tq",
"<(V8_ROOT)/src/builtins/array-unshift.tq",
"<(V8_ROOT)/src/builtins/array.tq",
"<(V8_ROOT)/src/builtins/arraybuffer.tq",
"<(V8_ROOT)/src/builtins/base.tq",
"<(V8_ROOT)/src/builtins/bigint.tq",
"<(V8_ROOT)/src/builtins/boolean.tq",
Expand Down Expand Up @@ -232,26 +233,30 @@
'<@(torque_files)',
],
'outputs': [
'<(torque_output_root)/torque-generated/bit-fields-tq.h',
'<(torque_output_root)/torque-generated/builtin-definitions-tq.h',
'<(torque_output_root)/torque-generated/interface-descriptors-tq.inc',
'<(torque_output_root)/torque-generated/factory-tq.cc',
'<(torque_output_root)/torque-generated/factory-tq.inc',
'<(torque_output_root)/torque-generated/field-offsets-tq.h',
'<(torque_output_root)/torque-generated/class-verifiers-tq.cc',
'<(torque_output_root)/torque-generated/class-verifiers-tq.h',
'<(torque_output_root)/torque-generated/enum-verifiers-tq.cc',
'<(torque_output_root)/torque-generated/objects-printer-tq.cc',
'<(torque_output_root)/torque-generated/objects-body-descriptors-tq-inl.inc',
'<(torque_output_root)/torque-generated/class-definitions-tq.cc',
'<(torque_output_root)/torque-generated/class-definitions-tq-inl.h',
'<(torque_output_root)/torque-generated/class-definitions-tq.h',
'<(torque_output_root)/torque-generated/class-debug-readers-tq.cc',
'<(torque_output_root)/torque-generated/class-debug-readers-tq.h',
'<(torque_output_root)/torque-generated/exported-macros-assembler-tq.cc',
'<(torque_output_root)/torque-generated/exported-macros-assembler-tq.h',
'<(torque_output_root)/torque-generated/csa-types-tq.h',
'<(torque_output_root)/torque-generated/instance-types-tq.h',
'<(torque_output_root)/torque-generated/bit-fields.h',
'<(torque_output_root)/torque-generated/builtin-definitions.h',
'<(torque_output_root)/torque-generated/interface-descriptors.inc',
'<(torque_output_root)/torque-generated/factory.cc',
'<(torque_output_root)/torque-generated/factory.inc',
'<(torque_output_root)/torque-generated/field-offsets.h',
'<(torque_output_root)/torque-generated/class-verifiers.cc',
'<(torque_output_root)/torque-generated/class-verifiers.h',
'<(torque_output_root)/torque-generated/enum-verifiers.cc',
'<(torque_output_root)/torque-generated/objects-printer.cc',
'<(torque_output_root)/torque-generated/objects-body-descriptors-inl.inc',
'<(torque_output_root)/torque-generated/class-definitions.cc',
'<(torque_output_root)/torque-generated/class-definitions-inl.h',
'<(torque_output_root)/torque-generated/class-definitions.h',
'<(torque_output_root)/torque-generated/class-debug-readers.cc',
'<(torque_output_root)/torque-generated/class-debug-readers.h',
'<(torque_output_root)/torque-generated/exported-macros-assembler.cc',
'<(torque_output_root)/torque-generated/exported-macros-assembler.h',
'<(torque_output_root)/torque-generated/csa-types.h',
'<(torque_output_root)/torque-generated/instance-types.h',
'<(torque_output_root)/torque-generated/internal-class-definitions.h',
'<(torque_output_root)/torque-generated/internal-class-definitions-inl.h',
'<(torque_output_root)/torque-generated/exported-class-definitions.h',
'<(torque_output_root)/torque-generated/exported-class-definitions-inl.h',
'<@(torque_outputs)',
],
'action': [
Expand Down Expand Up @@ -298,10 +303,10 @@
],
'direct_dependent_settings': {
'sources': [
'<(torque_output_root)/torque-generated/csa-types-tq.h',
'<(torque_output_root)/torque-generated/enum-verifiers-tq.cc',
'<(torque_output_root)/torque-generated/exported-macros-assembler-tq.cc',
'<(torque_output_root)/torque-generated/exported-macros-assembler-tq.h',
'<(torque_output_root)/torque-generated/csa-types.h',
'<(torque_output_root)/torque-generated/enum-verifiers.cc',
'<(torque_output_root)/torque-generated/exported-macros-assembler.cc',
'<(torque_output_root)/torque-generated/exported-macros-assembler.h',
'<(V8_ROOT)/src/torque/runtime-support.h',
'<@(torque_outputs)',
],
Expand All @@ -323,11 +328,11 @@
],
'direct_dependent_settings': {
'sources': [
'<(torque_output_root)/torque-generated/class-definitions-tq.cc',
'<(torque_output_root)/torque-generated/class-verifiers-tq.cc',
'<(torque_output_root)/torque-generated/class-verifiers-tq.h',
'<(torque_output_root)/torque-generated/factory-tq.cc',
'<(torque_output_root)/torque-generated/objects-printer-tq.cc',
'<(torque_output_root)/torque-generated/class-definitions.cc',
'<(torque_output_root)/torque-generated/class-verifiers.cc',
'<(torque_output_root)/torque-generated/class-verifiers.h',
'<(torque_output_root)/torque-generated/factory.cc',
'<(torque_output_root)/torque-generated/objects-printer.cc',
],
'include_dirs': [
'<(torque_output_root)',
Expand Down Expand Up @@ -1487,6 +1492,8 @@
'sources': [
'<(V8_ROOT)/src/heap/base/stack.cc',
'<(V8_ROOT)/src/heap/base/stack.h',
'<(V8_ROOT)/src/heap/base/worklist.cc',
'<(V8_ROOT)/src/heap/base/worklist.h',
],
'conditions': [
['clang or OS!="win"', {
Expand Down Expand Up @@ -1671,7 +1678,7 @@
'dependencies': ['run_torque'],
'variables': {
'heapobject_files': [
'<(torque_output_root)/torque-generated/instance-types-tq.h',
'<(torque_output_root)/torque-generated/instance-types.h',
'<(V8_ROOT)/src/objects/allocation-site.h',
'<(V8_ROOT)/src/objects/allocation-site-inl.h',
'<(V8_ROOT)/src/objects/cell.h',
Expand All @@ -1695,6 +1702,7 @@
'<(V8_ROOT)/src/objects/js-array-buffer-inl.h',
'<(V8_ROOT)/src/objects/js-array.h',
'<(V8_ROOT)/src/objects/js-array-inl.h',
'<(V8_ROOT)/src/objects/js-function-inl.h',
'<(V8_ROOT)/src/objects/js-function.cc',
'<(V8_ROOT)/src/objects/js-function.h',
'<(V8_ROOT)/src/objects/js-objects.cc',
Expand Down

0 comments on commit b7311fb

Please sign in to comment.