Skip to content

Commit

Permalink
deps: sync V8 gypfiles with 7.3
Browse files Browse the repository at this point in the history
Co-authored-by: Michaël Zasso <targos@protonmail.com>
Co-authored-by: Refael Ackermann <refack@gmail.com>
Co-authored-by: Colin Ihrig <cjihrig@gmail.com>

PR-URL: #25852
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
  • Loading branch information
ryzokuken authored and targos committed Mar 14, 2019
1 parent d266e3e commit cefb802
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 189 deletions.
3 changes: 0 additions & 3 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@
# Still WIP in V8 7.1
'v8_enable_pointer_compression': 'false',

# Explicitly set to false to copy V8's default
'v8_enable_31bit_smis_on_64bit_arch': 'false',

# New in V8 7.1
'v8_enable_embedded_builtins': 'true',

Expand Down
42 changes: 1 addition & 41 deletions deps/v8/gypfiles/d8.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
'<(SHARED_INTERMEDIATE_DIR)',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
'../src/async-hooks-wrapper.cc',
'../src/async-hooks-wrapper.h',
'../src/d8-console.cc',
'../src/d8-console.h',
'../src/d8-js.cc',
'../src/d8-platforms.cc',
'../src/d8-platforms.h',
'../src/d8.cc',
Expand All @@ -42,10 +42,6 @@
'dependencies': [
'd8_js2c#host',
],
}, {
'dependencies': [
'd8_js2c',
],
}],
['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
or OS=="openbsd" or OS=="solaris" or OS=="android" \
Expand Down Expand Up @@ -84,41 +80,5 @@
}],
],
},
{
'target_name': 'd8_js2c',
'type': 'none',
'variables': {
'js_files': [
'../src/d8.js',
'../src/js/macros.py',
],
},
'conditions': [
[ 'want_separate_host_toolset==1', {
'toolsets': ['host'],
}, {
'toolsets': ['target'],
}]
],
'actions': [
{
'action_name': 'd8_js2c',
'inputs': [
'../tools/js2c.py',
'<@(js_files)',
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
],
'action': [
'python',
'../tools/js2c.py',
'<@(_outputs)',
'D8',
'<@(js_files)'
],
},
],
},
],
}
33 changes: 13 additions & 20 deletions deps/v8/gypfiles/features.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@

'v8_enable_gdbjit%': 0,

# Build-time flag for enabling nojit mode.
# TODO(v8:7777): Remove the build-time flag once the --jitless runtime flag
# does everything we need.
'v8_enable_jitless_mode%': 0,

# Enable code-generation-time checking of types in the CodeStubAssembler.
'v8_enable_verify_csa%': 0,

Expand All @@ -81,6 +76,9 @@
# tools/gen-postmortem-metadata.py for details.
'v8_postmortem_support%': 'false',

# Use Siphash as added protection against hash flooding attacks.
'v8_use_siphash%': 'false',

# Interpreted regexp engine exists as platform-independent alternative
# based where the regular expression is compiled to a bytecode.
'v8_interpreted_regexp%': 0,
Expand Down Expand Up @@ -121,23 +119,16 @@
#'v8_enable_handle_zapping%': 0,

'v8_enable_pointer_compression%': 'false',

'v8_enable_31bit_smis_on_64bit_arch%': 'false',

'v8_enable_embedded_builtins%': 'true',

# Enable code comments for builtins in the snapshot (impacts performance).
'v8_enable_snapshot_code_comments%': 'false',

'v8_enable_fast_mksnapshot%': 0,
},

'conditions': [
# V8's predicate inverted since we default to 'true' and set 'false' for unsupported cases.
# !is_aix
['not (OS!="aix")', {
'variables': {
'v8_enable_embedded_builtins': 'false',
}
}],
],
'target_defaults': {
'conditions': [
['v8_embedder_string!=""', {
Expand All @@ -150,7 +141,12 @@
'defines': ['V8_PROMISE_INTERNAL_FIELD_COUNT=<(v8_promise_internal_field_count)'],
}],
['v8_enable_lite_mode==1', {
'defines': ['V8_LITE_MODE',],
'defines': [
'V8_LITE_MODE',

# TODO(v8:7777): Remove the define once the --jitless runtime flag does everything we need.
'V8_JITLESS_MODE',
],
}],
['v8_enable_gdbjit==1', {
'defines': ['ENABLE_GDB_JIT_INTERFACE',],
Expand All @@ -173,7 +169,7 @@
['v8_enable_verify_predictable==1', {
'defines': ['VERIFY_PREDICTABLE',],
}],
['v8_interpreted_regexp==1', {
['v8_interpreted_regexp==1 or v8_enable_lite_mode==1', {
'defines': ['V8_INTERPRETED_REGEXP',],
}],
['v8_deprecation_warnings==1', {
Expand Down Expand Up @@ -222,9 +218,6 @@
'V8_EMBEDDED_BUILTINS',
],
}],
['v8_enable_jitless_mode==1', {
'defines': ['V8_JITLESS_MODE',],
}],
], # conditions
'defines': [
'V8_GYP_BUILD',
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/gypfiles/inspector.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
'process_outputs_as_sources': 1,
'action': [
'python',
'<(protocol_path)/CodeGenerator.py',
'<(protocol_path)/code_generator.py',
'--jinja_dir', '../third_party',
'--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/inspector',
'--config', '<(inspector_path)/inspector_protocol_config.json',
Expand Down
1 change: 0 additions & 1 deletion deps/v8/gypfiles/v8-monolithic.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
'v8_vector_stores%': 0,
'v8_embed_script%': "",
'v8_extra_library_files%': [],
'v8_experimental_extra_library_files%': [],
'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
'v8_os_page_size%': 0,
},
Expand Down
Loading

0 comments on commit cefb802

Please sign in to comment.