Skip to content

Commit

Permalink
tools: update V8 gypfiles
Browse files Browse the repository at this point in the history 
until bfe3d6bce734e596e312465e207bcfd55a59fe34
  • Loading branch information
@targos @nodejs-ci
targos authored and nodejs-ci committed Nov 4, 2019
1 parent d0a39e7 commit 423457e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 54 deletions.
7 changes: 1 addition & 6 deletions tools/v8_gypfiles/features.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,6 @@
# Enable fast mksnapshot runs.
'v8_enable_fast_mksnapshot%': 0,

# Enable embedded builtins.
'v8_enable_embedded_builtins%': 1,

# Enable the registration of unwinding info for Windows/x64 and ARM64.
'v8_win64_unwinding_info%': 1,

Expand Down Expand Up @@ -301,9 +298,6 @@
['v8_check_microtasks_scopes_consistency==1', {
'defines': ['V8_CHECK_MICROTASKS_SCOPES_CONSISTENCY',],
}],
['v8_enable_embedded_builtins==1', {
'defines': ['V8_EMBEDDED_BUILTINS',],
}],
['v8_use_siphash==1', {
'defines': ['V8_USE_SIPHASH',],
}],
Expand All @@ -327,6 +321,7 @@
}],
], # conditions
'defines': [
'V8_EMBEDDED_BUILTINS',
'V8_GYP_BUILD',
'V8_TYPED_ARRAY_MAX_SIZE_IN_HEAP=<(v8_typed_array_max_size_in_heap)',
], # defines
Expand Down
59 changes: 11 additions & 48 deletions tools/v8_gypfiles/v8.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"<(V8_ROOT)/src/builtins/array-find.tq",
"<(V8_ROOT)/src/builtins/array-findindex.tq",
"<(V8_ROOT)/src/builtins/array-foreach.tq",
"<(V8_ROOT)/src/builtins/array-isarray.tq",
"<(V8_ROOT)/src/builtins/array-join.tq",
"<(V8_ROOT)/src/builtins/array-lastindexof.tq",
"<(V8_ROOT)/src/builtins/array-map.tq",
Expand All @@ -37,8 +38,8 @@
"<(V8_ROOT)/src/builtins/bigint.tq",
"<(V8_ROOT)/src/builtins/boolean.tq",
"<(V8_ROOT)/src/builtins/collections.tq",
"<(V8_ROOT)/src/builtins/console.tq",
"<(V8_ROOT)/src/builtins/data-view.tq",
"<(V8_ROOT)/src/builtins/extras-utils.tq",
"<(V8_ROOT)/src/builtins/frames.tq",
"<(V8_ROOT)/src/builtins/growable-fixed-array.tq",
"<(V8_ROOT)/src/builtins/internal-coverage.tq",
Expand Down Expand Up @@ -78,6 +79,8 @@
"<(V8_ROOT)/src/builtins/string-slice.tq",
"<(V8_ROOT)/src/builtins/string-startswith.tq",
"<(V8_ROOT)/src/builtins/string-substring.tq",
"<(V8_ROOT)/src/builtins/string-substr.tq",
"<(V8_ROOT)/src/builtins/symbol.tq",
"<(V8_ROOT)/src/builtins/torque-internal.tq",
"<(V8_ROOT)/src/builtins/typed-array-createtypedarray.tq",
"<(V8_ROOT)/src/builtins/typed-array-every.tq",
Expand Down Expand Up @@ -268,11 +271,7 @@
},
],
}, # generate_bytecode_builtins_list

{
# This rule delegates to either v8_snapshot or v8_nosnapshot depending on
# the current variables.
# The intention is to make the 'calling' rules a bit simpler.
'target_name': 'v8_maybe_snapshot',
'type': 'none',
'toolsets': ['target'],
Expand Down Expand Up @@ -412,7 +411,6 @@
],
'sources': [
'<(V8_ROOT)/src/init/setup-isolate-deserialize.cc',
'./extras-libraries.cc',
],
'xcode_settings': {
# V8 7.4 over macOS10.11 compatibility
Expand All @@ -433,27 +431,19 @@
'--target_os=<(OS)',
'--target_arch=<(v8_target_arch)',
'--startup_src', '<(INTERMEDIATE_DIR)/snapshot.cc',
'--embedded_variant', 'Default',
'--embedded_src', '<(INTERMEDIATE_DIR)/embedded.S',
],
},
'inputs': [
'<(mksnapshot_exec)',
],
'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"],
'outputs': [
'<(INTERMEDIATE_DIR)/snapshot.cc',
'<(INTERMEDIATE_DIR)/embedded.S',
],
'process_outputs_as_sources': 1,
'conditions': [
['v8_enable_embedded_builtins', {
# In this case we use `embedded_variant "Default"`
# and `suffix = ''` for the template `embedded${suffix}.S`.
'outputs': ['<(INTERMEDIATE_DIR)/embedded.S'],
'variables': {
'mksnapshot_flags': [
'--embedded_variant', 'Default',
'--embedded_src', '<(INTERMEDIATE_DIR)/embedded.S',
],
},
}, {
'outputs': ['<(V8_ROOT)/src/snapshot/embedded/embedded-empty.cc']
}],
['v8_random_seed', {
'variables': {
'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'],
Expand Down Expand Up @@ -494,31 +484,6 @@
},
],
}, # v8_snapshot
{
'target_name': 'v8_nosnapshot',
'type': 'static_library',
'dependencies': [
# 'js2c_extras', # Disabled for Node.js
'generate_bytecode_builtins_list',
'run_torque',
'v8_maybe_icu',
],
'sources': [
'./extras-libraries.cc',
'<(V8_ROOT)/src/snapshot/embedded/embedded-empty.cc',
'<(V8_ROOT)/src/snapshot/snapshot-empty.cc',
],
'conditions': [
['want_separate_host_toolset', {
'toolsets': ['host', 'target'],
}],
['component=="shared_library"', {
'defines': [
'BUILDING_V8_SHARED',
],
}],
]
}, # v8_nosnapshot
{
'target_name': 'v8_version',
'type': 'none',
Expand Down Expand Up @@ -1284,9 +1249,8 @@
'v8_init',
'v8_libbase',
'v8_libplatform',
'v8_nosnapshot',
# "build/win:default_exe_manifest",
'v8_maybe_icu',
# "build/win:default_exe_manifest",
],
'sources': [
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"mksnapshot.*?sources = ")',
Expand Down Expand Up @@ -1486,7 +1450,6 @@
'v8_enable_verify_predictable=<(v8_enable_verify_predictable)',
'v8_target_cpu=<(v8_target_arch)',
'v8_use_siphash=<(v8_use_siphash)',
'v8_enable_embedded_builtins=<(v8_enable_embedded_builtins)',
'v8_enable_verify_csa=<(v8_enable_verify_csa)',
'v8_enable_lite_mode=<(v8_enable_lite_mode)',
'v8_enable_pointer_compression=<(v8_enable_pointer_compression)',
Expand Down

0 comments on commit 423457e

Please sign in to comment.