Skip to content

Commit 405ae19

Browse files
mmarchinimmarchini
committedMar 18, 2020
tools: update V8 gypfiles for 8.1
Co-authored-by: Ben Noordhuis <[email protected]> Co-authored-by: Michaël Zasso <[email protected]> Co-authored-by: Richard Lau <[email protected]> Co-authored-by: Ujjwal Sharma <[email protected]> PR-URL: nodejs#32116 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent 339c192 commit 405ae19

File tree

4 files changed

+141
-123
lines changed

4 files changed

+141
-123
lines changed
 

‎node.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
}],
7171
[ 'node_use_bundled_v8=="true"', {
7272
'dependencies': [
73-
'tools/v8_gypfiles/v8.gyp:v8_maybe_snapshot',
73+
'tools/v8_gypfiles/v8.gyp:v8_snapshot',
7474
'tools/v8_gypfiles/v8.gyp:v8_libplatform',
7575
],
7676
}],

‎tools/v8_gypfiles/features.gypi

+8-7
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@
109109
# Enable fast mksnapshot runs.
110110
'v8_enable_fast_mksnapshot%': 0,
111111

112-
# Enable embedded builtins.
113-
'v8_enable_embedded_builtins%': 1,
114-
115112
# Enable the registration of unwinding info for Windows/x64 and ARM64.
116113
'v8_win64_unwinding_info%': 1,
117114

@@ -129,7 +126,7 @@
129126

130127
# Enable pointer compression (sets -dV8_COMPRESS_POINTERS).
131128
'v8_enable_pointer_compression%': 0,
132-
'v8_enable_31bit_smis_on_64bit_arch%': 0,
129+
'v8_enable_31bit_smis_on_64bit_arch%': 1,
133130

134131
# Sets -dOBJECT_PRINT.
135132
'v8_enable_object_print%': 0,
@@ -149,6 +146,9 @@
149146
# Sets -dV8_CONCURRENT_MARKING
150147
'v8_enable_concurrent_marking%': 1,
151148

149+
# Sets -dV8_ARRAY_BUFFER_EXTENSION
150+
'v8_enable_array_buffer_extension%': 0,
151+
152152
# Enables various testing features.
153153
'v8_enable_test_features%': 0,
154154

@@ -295,15 +295,15 @@
295295
['v8_enable_concurrent_marking==1', {
296296
'defines': ['V8_CONCURRENT_MARKING',],
297297
}],
298+
['v8_enable_array_buffer_extension==1', {
299+
'defines': ['V8_ARRAY_BUFFER_EXTENSION',],
300+
}],
298301
['v8_enable_lazy_source_positions==1', {
299302
'defines': ['V8_ENABLE_LAZY_SOURCE_POSITIONS',],
300303
}],
301304
['v8_check_microtasks_scopes_consistency==1', {
302305
'defines': ['V8_CHECK_MICROTASKS_SCOPES_CONSISTENCY',],
303306
}],
304-
['v8_enable_embedded_builtins==1', {
305-
'defines': ['V8_EMBEDDED_BUILTINS',],
306-
}],
307307
['v8_use_siphash==1', {
308308
'defines': ['V8_USE_SIPHASH',],
309309
}],
@@ -327,6 +327,7 @@
327327
}],
328328
], # conditions
329329
'defines': [
330+
'V8_EMBEDDED_BUILTINS',
330331
'V8_GYP_BUILD',
331332
'V8_TYPED_ARRAY_MAX_SIZE_IN_HEAP=<(v8_typed_array_max_size_in_heap)',
332333
], # defines

‎tools/v8_gypfiles/inspector.gypi

+17-11
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@
8686
'<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.h',
8787
'<(V8_ROOT)/src/inspector/v8-inspector-impl.cc',
8888
'<(V8_ROOT)/src/inspector/v8-inspector-impl.h',
89-
'<(V8_ROOT)/src/inspector/v8-inspector-protocol-encoding.cc',
90-
'<(V8_ROOT)/src/inspector/v8-inspector-protocol-encoding.h',
9189
'<(V8_ROOT)/src/inspector/v8-inspector-session-impl.cc',
9290
'<(V8_ROOT)/src/inspector/v8-inspector-session-impl.h',
9391
'<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.cc',
@@ -104,18 +102,26 @@
104102
'<(V8_ROOT)/src/inspector/v8-value-utils.h',
105103
'<(V8_ROOT)/src/inspector/value-mirror.cc',
106104
'<(V8_ROOT)/src/inspector/value-mirror.h',
107-
'<(V8_ROOT)/src/inspector/wasm-translation.cc',
108-
'<(V8_ROOT)/src/inspector/wasm-translation.h',
109105
# Flat merge `third_party/inspector_protocol:inspector_string_conversions`
110106
'<(inspector_path)/v8-string-conversions.cc',
111107
'<(inspector_path)/v8-string-conversions.h',
112-
# Flat merge `third_party/inspector_protocol:encoding`
113-
'<(inspector_protocol_path)/encoding/encoding.cc',
114-
'<(inspector_protocol_path)/encoding/encoding.h',
115-
# Flat merge `third_party/inspector_protocol:bindings`
116-
'<(inspector_protocol_path)/bindings/bindings.cc',
117-
'<(inspector_protocol_path)/bindings/bindings.h',
118-
108+
# Flat merge `third_party/inspector_protocal:crdtp_platform`
109+
'<(inspector_protocol_path)/crdtp/json_platform.h',
110+
'<(inspector_protocol_path)/crdtp/json_platform_v8.cc',
111+
# Flat merge `third_party/inspector_protocol:crdtp`
112+
'<(inspector_protocol_path)/crdtp/cbor.cc',
113+
'<(inspector_protocol_path)/crdtp/cbor.h',
114+
'<(inspector_protocol_path)/crdtp/export.h',
115+
'<(inspector_protocol_path)/crdtp/glue.h',
116+
'<(inspector_protocol_path)/crdtp/json.cc',
117+
'<(inspector_protocol_path)/crdtp/json.h',
118+
'<(inspector_protocol_path)/crdtp/parser_handler.h',
119+
'<(inspector_protocol_path)/crdtp/serializable.cc',
120+
'<(inspector_protocol_path)/crdtp/serializable.h',
121+
'<(inspector_protocol_path)/crdtp/serializer_traits.h',
122+
'<(inspector_protocol_path)/crdtp/span.h',
123+
'<(inspector_protocol_path)/crdtp/status.cc',
124+
'<(inspector_protocol_path)/crdtp/status.h',
119125
],
120126
'v8_inspector_js_protocol': '<(V8_ROOT)/include/js_protocol.pdl',
121127
},

‎tools/v8_gypfiles/v8.gyp

+115-104
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
1414
'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
1515
'torque_files': [
16-
"<(V8_ROOT)/src/builtins/arguments.tq",
1716
"<(V8_ROOT)/src/builtins/array-copywithin.tq",
1817
"<(V8_ROOT)/src/builtins/array-every.tq",
1918
"<(V8_ROOT)/src/builtins/array-filter.tq",
2019
"<(V8_ROOT)/src/builtins/array-find.tq",
2120
"<(V8_ROOT)/src/builtins/array-findindex.tq",
2221
"<(V8_ROOT)/src/builtins/array-foreach.tq",
22+
"<(V8_ROOT)/src/builtins/array-from.tq",
23+
"<(V8_ROOT)/src/builtins/array-isarray.tq",
2324
"<(V8_ROOT)/src/builtins/array-join.tq",
2425
"<(V8_ROOT)/src/builtins/array-lastindexof.tq",
2526
"<(V8_ROOT)/src/builtins/array-map.tq",
@@ -36,16 +37,32 @@
3637
"<(V8_ROOT)/src/builtins/base.tq",
3738
"<(V8_ROOT)/src/builtins/bigint.tq",
3839
"<(V8_ROOT)/src/builtins/boolean.tq",
40+
"<(V8_ROOT)/src/builtins/builtins-string.tq",
3941
"<(V8_ROOT)/src/builtins/collections.tq",
42+
"<(V8_ROOT)/src/builtins/cast.tq",
43+
"<(V8_ROOT)/src/builtins/convert.tq",
44+
"<(V8_ROOT)/src/builtins/console.tq",
4045
"<(V8_ROOT)/src/builtins/data-view.tq",
41-
"<(V8_ROOT)/src/builtins/extras-utils.tq",
4246
"<(V8_ROOT)/src/builtins/frames.tq",
47+
"<(V8_ROOT)/src/builtins/frame-arguments.tq",
4348
"<(V8_ROOT)/src/builtins/growable-fixed-array.tq",
4449
"<(V8_ROOT)/src/builtins/internal-coverage.tq",
4550
"<(V8_ROOT)/src/builtins/iterator.tq",
4651
"<(V8_ROOT)/src/builtins/math.tq",
52+
"<(V8_ROOT)/src/builtins/number.tq",
4753
"<(V8_ROOT)/src/builtins/object-fromentries.tq",
4854
"<(V8_ROOT)/src/builtins/object.tq",
55+
"<(V8_ROOT)/src/builtins/promise-abstract-operations.tq",
56+
"<(V8_ROOT)/src/builtins/promise-all.tq",
57+
"<(V8_ROOT)/src/builtins/promise-all-element-closure.tq",
58+
"<(V8_ROOT)/src/builtins/promise-constructor.tq",
59+
"<(V8_ROOT)/src/builtins/promise-finally.tq",
60+
"<(V8_ROOT)/src/builtins/promise-misc.tq",
61+
"<(V8_ROOT)/src/builtins/promise-race.tq",
62+
"<(V8_ROOT)/src/builtins/promise-reaction-job.tq",
63+
"<(V8_ROOT)/src/builtins/promise-resolve.tq",
64+
"<(V8_ROOT)/src/builtins/promise-then.tq",
65+
"<(V8_ROOT)/src/builtins/promise-jobs.tq",
4966
"<(V8_ROOT)/src/builtins/proxy-constructor.tq",
5067
"<(V8_ROOT)/src/builtins/proxy-delete-property.tq",
5168
"<(V8_ROOT)/src/builtins/proxy-get-property.tq",
@@ -68,30 +85,90 @@
6885
"<(V8_ROOT)/src/builtins/regexp-split.tq",
6986
"<(V8_ROOT)/src/builtins/regexp-test.tq",
7087
"<(V8_ROOT)/src/builtins/regexp.tq",
71-
"<(V8_ROOT)/src/builtins/string.tq",
7288
"<(V8_ROOT)/src/builtins/string-endswith.tq",
7389
"<(V8_ROOT)/src/builtins/string-html.tq",
7490
"<(V8_ROOT)/src/builtins/string-iterator.tq",
7591
"<(V8_ROOT)/src/builtins/string-pad.tq",
7692
"<(V8_ROOT)/src/builtins/string-repeat.tq",
93+
"<(V8_ROOT)/src/builtins/string-replaceall.tq",
7794
"<(V8_ROOT)/src/builtins/string-slice.tq",
7895
"<(V8_ROOT)/src/builtins/string-startswith.tq",
7996
"<(V8_ROOT)/src/builtins/string-substring.tq",
97+
"<(V8_ROOT)/src/builtins/string-substr.tq",
98+
"<(V8_ROOT)/src/builtins/symbol.tq",
8099
"<(V8_ROOT)/src/builtins/torque-internal.tq",
81100
"<(V8_ROOT)/src/builtins/typed-array-createtypedarray.tq",
82101
"<(V8_ROOT)/src/builtins/typed-array-every.tq",
83102
"<(V8_ROOT)/src/builtins/typed-array-filter.tq",
84103
"<(V8_ROOT)/src/builtins/typed-array-find.tq",
85104
"<(V8_ROOT)/src/builtins/typed-array-findindex.tq",
86105
"<(V8_ROOT)/src/builtins/typed-array-foreach.tq",
106+
"<(V8_ROOT)/src/builtins/typed-array-from.tq",
107+
"<(V8_ROOT)/src/builtins/typed-array-of.tq",
87108
"<(V8_ROOT)/src/builtins/typed-array-reduce.tq",
88109
"<(V8_ROOT)/src/builtins/typed-array-reduceright.tq",
110+
"<(V8_ROOT)/src/builtins/typed-array-set.tq",
89111
"<(V8_ROOT)/src/builtins/typed-array-slice.tq",
90112
"<(V8_ROOT)/src/builtins/typed-array-some.tq",
113+
"<(V8_ROOT)/src/builtins/typed-array-sort.tq",
91114
"<(V8_ROOT)/src/builtins/typed-array-subarray.tq",
92115
"<(V8_ROOT)/src/builtins/typed-array.tq",
93-
"<(V8_ROOT)/third_party/v8/builtins/array-sort.tq",
116+
"<(V8_ROOT)/src/ic/handler-configuration.tq",
117+
"<(V8_ROOT)/src/objects/allocation-site.tq",
118+
"<(V8_ROOT)/src/objects/api-callbacks.tq",
119+
"<(V8_ROOT)/src/objects/arguments.tq",
120+
"<(V8_ROOT)/src/objects/cell.tq",
121+
"<(V8_ROOT)/src/objects/code.tq",
122+
"<(V8_ROOT)/src/objects/contexts.tq",
123+
"<(V8_ROOT)/src/objects/data-handler.tq",
124+
"<(V8_ROOT)/src/objects/debug-objects.tq",
125+
"<(V8_ROOT)/src/objects/descriptor-array.tq",
126+
"<(V8_ROOT)/src/objects/embedder-data-array.tq",
127+
"<(V8_ROOT)/src/objects/feedback-cell.tq",
128+
"<(V8_ROOT)/src/objects/feedback-vector.tq",
129+
"<(V8_ROOT)/src/objects/fixed-array.tq",
130+
"<(V8_ROOT)/src/objects/foreign.tq",
131+
"<(V8_ROOT)/src/objects/free-space.tq",
132+
"<(V8_ROOT)/src/objects/heap-number.tq",
133+
"<(V8_ROOT)/src/objects/heap-object.tq",
134+
"<(V8_ROOT)/src/objects/js-array-buffer.tq",
135+
"<(V8_ROOT)/src/objects/js-array.tq",
136+
"<(V8_ROOT)/src/objects/js-collection-iterator.tq",
137+
"<(V8_ROOT)/src/objects/js-collection.tq",
138+
"<(V8_ROOT)/src/objects/js-generator.tq",
139+
"<(V8_ROOT)/src/objects/js-objects.tq",
140+
"<(V8_ROOT)/src/objects/js-promise.tq",
141+
"<(V8_ROOT)/src/objects/js-proxy.tq",
142+
"<(V8_ROOT)/src/objects/js-regexp-string-iterator.tq",
143+
"<(V8_ROOT)/src/objects/js-regexp.tq",
144+
"<(V8_ROOT)/src/objects/js-weak-refs.tq",
145+
"<(V8_ROOT)/src/objects/literal-objects.tq",
146+
"<(V8_ROOT)/src/objects/map.tq",
147+
"<(V8_ROOT)/src/objects/microtask.tq",
148+
"<(V8_ROOT)/src/objects/module.tq",
149+
"<(V8_ROOT)/src/objects/name.tq",
150+
"<(V8_ROOT)/src/objects/oddball.tq",
151+
"<(V8_ROOT)/src/objects/ordered-hash-table.tq",
152+
"<(V8_ROOT)/src/objects/primitive-heap-object.tq",
153+
"<(V8_ROOT)/src/objects/promise.tq",
154+
"<(V8_ROOT)/src/objects/property-array.tq",
155+
"<(V8_ROOT)/src/objects/property-cell.tq",
156+
"<(V8_ROOT)/src/objects/property-descriptor-object.tq",
157+
"<(V8_ROOT)/src/objects/prototype-info.tq",
158+
"<(V8_ROOT)/src/objects/regexp-match-info.tq",
159+
"<(V8_ROOT)/src/objects/scope-info.tq",
160+
"<(V8_ROOT)/src/objects/script.tq",
161+
"<(V8_ROOT)/src/objects/shared-function-info.tq",
162+
"<(V8_ROOT)/src/objects/source-text-module.tq",
163+
"<(V8_ROOT)/src/objects/stack-frame-info.tq",
164+
"<(V8_ROOT)/src/objects/string.tq",
165+
"<(V8_ROOT)/src/objects/struct.tq",
166+
"<(V8_ROOT)/src/objects/synthetic-module.tq",
167+
"<(V8_ROOT)/src/objects/template-objects.tq",
168+
"<(V8_ROOT)/src/objects/template.tq",
169+
"<(V8_ROOT)/src/wasm/wasm-objects.tq",
94170
"<(V8_ROOT)/test/torque/test-torque.tq",
171+
"<(V8_ROOT)/third_party/v8/builtins/array-sort.tq",
95172
],
96173
'torque_output_root': '<(SHARED_INTERMEDIATE_DIR)/torque-output-root',
97174
'torque_files_replaced': ['<!@pymod_do_main(ForEachReplace ".tq" "-tq-csa" <@(torque_files))'],
@@ -141,11 +218,13 @@
141218
'<@(torque_files)',
142219
],
143220
'outputs': [
221+
'<(torque_output_root)/torque-generated/bit-fields-tq.h',
144222
'<(torque_output_root)/torque-generated/builtin-definitions-tq.h',
145223
'<(torque_output_root)/torque-generated/interface-descriptors-tq.inc',
146224
'<(torque_output_root)/torque-generated/field-offsets-tq.h',
147225
'<(torque_output_root)/torque-generated/class-verifiers-tq.cc',
148226
'<(torque_output_root)/torque-generated/class-verifiers-tq.h',
227+
'<(torque_output_root)/torque-generated/enum-verifiers-tq.cc',
149228
'<(torque_output_root)/torque-generated/objects-printer-tq.cc',
150229
'<(torque_output_root)/torque-generated/class-definitions-tq.cc',
151230
'<(torque_output_root)/torque-generated/class-definitions-tq-inl.h',
@@ -202,9 +281,11 @@
202281
],
203282
'direct_dependent_settings': {
204283
'sources': [
284+
'<(torque_output_root)/torque-generated/csa-types-tq.h',
285+
'<(torque_output_root)/torque-generated/enum-verifiers-tq.cc',
205286
'<(torque_output_root)/torque-generated/exported-macros-assembler-tq.cc',
206287
'<(torque_output_root)/torque-generated/exported-macros-assembler-tq.h',
207-
'<(torque_output_root)/torque-generated/csa-types-tq.h',
288+
'<(V8_ROOT)/src/torque/runtime-support.h',
208289
'<@(torque_outputs)',
209290
],
210291
}
@@ -274,17 +355,6 @@
274355
},
275356
],
276357
}, # generate_bytecode_builtins_list
277-
278-
{
279-
# This rule delegates to either v8_snapshot or v8_nosnapshot depending on
280-
# the current variables.
281-
# The intention is to make the 'calling' rules a bit simpler.
282-
'target_name': 'v8_maybe_snapshot',
283-
'type': 'none',
284-
'toolsets': ['target'],
285-
'hard_dependency': 1,
286-
'dependencies': ['v8_base', 'v8_snapshot'],
287-
}, # v8_maybe_snapshot
288358
{
289359
'target_name': 'v8_init',
290360
'type': 'static_library',
@@ -418,7 +488,6 @@
418488
],
419489
'sources': [
420490
'<(V8_ROOT)/src/init/setup-isolate-deserialize.cc',
421-
'./extras-libraries.cc',
422491
],
423492
'xcode_settings': {
424493
# V8 7.4 over macOS10.11 compatibility
@@ -439,27 +508,19 @@
439508
'--target_os=<(OS)',
440509
'--target_arch=<(v8_target_arch)',
441510
'--startup_src', '<(INTERMEDIATE_DIR)/snapshot.cc',
511+
'--embedded_variant', 'Default',
512+
'--embedded_src', '<(INTERMEDIATE_DIR)/embedded.S',
442513
],
443514
},
444515
'inputs': [
445516
'<(mksnapshot_exec)',
446517
],
447-
'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"],
518+
'outputs': [
519+
'<(INTERMEDIATE_DIR)/snapshot.cc',
520+
'<(INTERMEDIATE_DIR)/embedded.S',
521+
],
448522
'process_outputs_as_sources': 1,
449523
'conditions': [
450-
['v8_enable_embedded_builtins', {
451-
# In this case we use `embedded_variant "Default"`
452-
# and `suffix = ''` for the template `embedded${suffix}.S`.
453-
'outputs': ['<(INTERMEDIATE_DIR)/embedded.S'],
454-
'variables': {
455-
'mksnapshot_flags': [
456-
'--embedded_variant', 'Default',
457-
'--embedded_src', '<(INTERMEDIATE_DIR)/embedded.S',
458-
],
459-
},
460-
}, {
461-
'outputs': ['<(V8_ROOT)/src/snapshot/embedded/embedded-empty.cc']
462-
}],
463524
['v8_random_seed', {
464525
'variables': {
465526
'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'],
@@ -500,31 +561,6 @@
500561
},
501562
],
502563
}, # v8_snapshot
503-
{
504-
'target_name': 'v8_nosnapshot',
505-
'type': 'static_library',
506-
'dependencies': [
507-
# 'js2c_extras', # Disabled for Node.js
508-
'generate_bytecode_builtins_list',
509-
'run_torque',
510-
'v8_maybe_icu',
511-
],
512-
'sources': [
513-
'./extras-libraries.cc',
514-
'<(V8_ROOT)/src/snapshot/embedded/embedded-empty.cc',
515-
'<(V8_ROOT)/src/snapshot/snapshot-empty.cc',
516-
],
517-
'conditions': [
518-
['want_separate_host_toolset', {
519-
'toolsets': ['host', 'target'],
520-
}],
521-
['component=="shared_library"', {
522-
'defines': [
523-
'BUILDING_V8_SHARED',
524-
],
525-
}],
526-
]
527-
}, # v8_nosnapshot
528564
{
529565
'target_name': 'v8_version',
530566
'type': 'none',
@@ -674,6 +710,7 @@
674710
'generate_bytecode_builtins_list',
675711
'run_torque',
676712
'v8_maybe_icu',
713+
'v8_zlib',
677714
],
678715
'includes': ['inspector.gypi'],
679716
'direct_dependent_settings': {
@@ -708,7 +745,7 @@
708745
'conditions': [
709746
# iOS Xcode simulator builds run on an x64 target. iOS and macOS are both
710747
# based on Darwin and thus POSIX-compliant to a similar degree.
711-
['OS=="linux" or OS=="mac" or OS=="ios"', {
748+
['OS=="linux" or OS=="mac" or OS=="ios" or OS=="freebsd"', {
712749
'sources': [
713750
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?is_linux.*?sources \+= ")',
714751
],
@@ -1205,49 +1242,6 @@
12051242
'<(V8_ROOT)/src/libsampler/sampler.h'
12061243
],
12071244
}, # v8_libsampler
1208-
1209-
# {
1210-
# 'target_name': 'fuzzer_support',
1211-
# 'type': 'static_library',
1212-
# 'conditions': [
1213-
# ['want_separate_host_toolset', {
1214-
# 'toolsets': ['host', 'target'],
1215-
# }],
1216-
# ],
1217-
# 'dependencies': [
1218-
# 'v8',
1219-
# 'v8_libbase',
1220-
# 'v8_libplatform',
1221-
# 'v8_maybe_icu',
1222-
# ],
1223-
# 'sources': [
1224-
# "<(V8_ROOT)/test/fuzzer/fuzzer-support.cc",
1225-
# "<(V8_ROOT)/test/fuzzer/fuzzer-support.h",
1226-
# ],
1227-
# }, # fuzzer_support
1228-
1229-
# {
1230-
# 'target_name': 'wee8',
1231-
# 'type': 'static_library',
1232-
# 'dependencies': [
1233-
# 'v8_base',
1234-
# 'v8_libbase',
1235-
# 'v8_libplatform',
1236-
# 'v8_libsampler',
1237-
# 'v8_maybe_snapshot',
1238-
# # 'build/win:default_exe_manifest',
1239-
# ],
1240-
# 'sources': [
1241-
# "<(V8_ROOT)/src/wasm/c-api.cc",
1242-
# "<(V8_ROOT)/third_party/wasm-api/wasm.h",
1243-
# "<(V8_ROOT)/third_party/wasm-api/wasm.hh",
1244-
# ],
1245-
# }, # wee8
1246-
1247-
# ###############################################################################
1248-
# # Executablesicu_path
1249-
# #
1250-
12511245
{
12521246
'target_name': 'bytecode_builtins_list_generator',
12531247
'type': 'executable',
@@ -1280,9 +1274,8 @@
12801274
'v8_init',
12811275
'v8_libbase',
12821276
'v8_libplatform',
1283-
'v8_nosnapshot',
1284-
# "build/win:default_exe_manifest",
12851277
'v8_maybe_icu',
1278+
# "build/win:default_exe_manifest",
12861279
],
12871280
'sources': [
12881281
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"mksnapshot.*?sources = ")',
@@ -1414,7 +1407,7 @@
14141407
'hard_dependency': 1,
14151408
'toolsets': ['target'],
14161409
'dependencies': [
1417-
'v8_maybe_snapshot'
1410+
'v8_snapshot',
14181411
],
14191412
'conditions': [
14201413
['component=="shared_library"', {
@@ -1482,7 +1475,6 @@
14821475
'v8_enable_verify_predictable=<(v8_enable_verify_predictable)',
14831476
'v8_target_cpu=<(v8_target_arch)',
14841477
'v8_use_siphash=<(v8_use_siphash)',
1485-
'v8_enable_embedded_builtins=<(v8_enable_embedded_builtins)',
14861478
'v8_enable_verify_csa=<(v8_enable_verify_csa)',
14871479
'v8_enable_lite_mode=<(v8_enable_lite_mode)',
14881480
'v8_enable_pointer_compression=<(v8_enable_pointer_compression)',
@@ -1602,5 +1594,24 @@
16021594
'sources': ['<(SHARED_INTERMEDIATE_DIR)/debug-support.cc', ],
16031595
},
16041596
}, # postmortem-metadata
1597+
1598+
{
1599+
'target_name': 'v8_zlib',
1600+
'type': 'static_library',
1601+
'conditions': [
1602+
['want_separate_host_toolset', {
1603+
'toolsets': ['host', 'target'],
1604+
}],
1605+
['OS=="win"', {
1606+
'defines': ['X86_WINDOWS'],
1607+
}],
1608+
],
1609+
'direct_dependent_settings': {
1610+
'include_dirs': [ '<(V8_ROOT)/third_party/zlib' ],
1611+
},
1612+
'defines': [ 'ZLIB_IMPLEMENTATION' ],
1613+
'include_dirs': [ '<(V8_ROOT)/third_party/zlib' ],
1614+
'sources': [ '<(V8_ROOT)/third_party/zlib/adler32.c' ],
1615+
}, # v8_zlib
16051616
],
16061617
}

0 commit comments

Comments
 (0)
Please sign in to comment.