Skip to content

Commit cefb802

Browse files
ryzokukentargos
authored andcommitted
deps: sync V8 gypfiles with 7.3
Co-authored-by: Michaël Zasso <[email protected]> Co-authored-by: Refael Ackermann <[email protected]> Co-authored-by: Colin Ihrig <[email protected]> PR-URL: #25852 Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Ali Ijaz Sheikh <[email protected]>
1 parent d266e3e commit cefb802

7 files changed

+92
-189
lines changed

common.gypi

-3
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@
7171
# Still WIP in V8 7.1
7272
'v8_enable_pointer_compression': 'false',
7373

74-
# Explicitly set to false to copy V8's default
75-
'v8_enable_31bit_smis_on_64bit_arch': 'false',
76-
7774
# New in V8 7.1
7875
'v8_enable_embedded_builtins': 'true',
7976

deps/v8/gypfiles/d8.gyp

+1-41
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
'<(SHARED_INTERMEDIATE_DIR)',
2727
],
2828
'sources': [
29-
'<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
3029
'../src/async-hooks-wrapper.cc',
3130
'../src/async-hooks-wrapper.h',
3231
'../src/d8-console.cc',
3332
'../src/d8-console.h',
33+
'../src/d8-js.cc',
3434
'../src/d8-platforms.cc',
3535
'../src/d8-platforms.h',
3636
'../src/d8.cc',
@@ -42,10 +42,6 @@
4242
'dependencies': [
4343
'd8_js2c#host',
4444
],
45-
}, {
46-
'dependencies': [
47-
'd8_js2c',
48-
],
4945
}],
5046
['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
5147
or OS=="openbsd" or OS=="solaris" or OS=="android" \
@@ -84,41 +80,5 @@
8480
}],
8581
],
8682
},
87-
{
88-
'target_name': 'd8_js2c',
89-
'type': 'none',
90-
'variables': {
91-
'js_files': [
92-
'../src/d8.js',
93-
'../src/js/macros.py',
94-
],
95-
},
96-
'conditions': [
97-
[ 'want_separate_host_toolset==1', {
98-
'toolsets': ['host'],
99-
}, {
100-
'toolsets': ['target'],
101-
}]
102-
],
103-
'actions': [
104-
{
105-
'action_name': 'd8_js2c',
106-
'inputs': [
107-
'../tools/js2c.py',
108-
'<@(js_files)',
109-
],
110-
'outputs': [
111-
'<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
112-
],
113-
'action': [
114-
'python',
115-
'../tools/js2c.py',
116-
'<@(_outputs)',
117-
'D8',
118-
'<@(js_files)'
119-
],
120-
},
121-
],
122-
},
12383
],
12484
}

deps/v8/gypfiles/features.gypi

+13-20
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@
5151

5252
'v8_enable_gdbjit%': 0,
5353

54-
# Build-time flag for enabling nojit mode.
55-
# TODO(v8:7777): Remove the build-time flag once the --jitless runtime flag
56-
# does everything we need.
57-
'v8_enable_jitless_mode%': 0,
58-
5954
# Enable code-generation-time checking of types in the CodeStubAssembler.
6055
'v8_enable_verify_csa%': 0,
6156

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

79+
# Use Siphash as added protection against hash flooding attacks.
80+
'v8_use_siphash%': 'false',
81+
8482
# Interpreted regexp engine exists as platform-independent alternative
8583
# based where the regular expression is compiled to a bytecode.
8684
'v8_interpreted_regexp%': 0,
@@ -121,23 +119,16 @@
121119
#'v8_enable_handle_zapping%': 0,
122120

123121
'v8_enable_pointer_compression%': 'false',
124-
125122
'v8_enable_31bit_smis_on_64bit_arch%': 'false',
126123

127124
'v8_enable_embedded_builtins%': 'true',
128125

126+
# Enable code comments for builtins in the snapshot (impacts performance).
127+
'v8_enable_snapshot_code_comments%': 'false',
128+
129129
'v8_enable_fast_mksnapshot%': 0,
130130
},
131131

132-
'conditions': [
133-
# V8's predicate inverted since we default to 'true' and set 'false' for unsupported cases.
134-
# !is_aix
135-
['not (OS!="aix")', {
136-
'variables': {
137-
'v8_enable_embedded_builtins': 'false',
138-
}
139-
}],
140-
],
141132
'target_defaults': {
142133
'conditions': [
143134
['v8_embedder_string!=""', {
@@ -150,7 +141,12 @@
150141
'defines': ['V8_PROMISE_INTERNAL_FIELD_COUNT=<(v8_promise_internal_field_count)'],
151142
}],
152143
['v8_enable_lite_mode==1', {
153-
'defines': ['V8_LITE_MODE',],
144+
'defines': [
145+
'V8_LITE_MODE',
146+
147+
# TODO(v8:7777): Remove the define once the --jitless runtime flag does everything we need.
148+
'V8_JITLESS_MODE',
149+
],
154150
}],
155151
['v8_enable_gdbjit==1', {
156152
'defines': ['ENABLE_GDB_JIT_INTERFACE',],
@@ -173,7 +169,7 @@
173169
['v8_enable_verify_predictable==1', {
174170
'defines': ['VERIFY_PREDICTABLE',],
175171
}],
176-
['v8_interpreted_regexp==1', {
172+
['v8_interpreted_regexp==1 or v8_enable_lite_mode==1', {
177173
'defines': ['V8_INTERPRETED_REGEXP',],
178174
}],
179175
['v8_deprecation_warnings==1', {
@@ -222,9 +218,6 @@
222218
'V8_EMBEDDED_BUILTINS',
223219
],
224220
}],
225-
['v8_enable_jitless_mode==1', {
226-
'defines': ['V8_JITLESS_MODE',],
227-
}],
228221
], # conditions
229222
'defines': [
230223
'V8_GYP_BUILD',

deps/v8/gypfiles/inspector.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
'process_outputs_as_sources': 1,
117117
'action': [
118118
'python',
119-
'<(protocol_path)/CodeGenerator.py',
119+
'<(protocol_path)/code_generator.py',
120120
'--jinja_dir', '../third_party',
121121
'--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/inspector',
122122
'--config', '<(inspector_path)/inspector_protocol_config.json',

deps/v8/gypfiles/v8-monolithic.gyp

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
'v8_vector_stores%': 0,
1010
'v8_embed_script%': "",
1111
'v8_extra_library_files%': [],
12-
'v8_experimental_extra_library_files%': [],
1312
'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
1413
'v8_os_page_size%': 0,
1514
},

0 commit comments

Comments
 (0)