Skip to content

Commit

Permalink
deps: update V8 gypfiles
Browse files Browse the repository at this point in the history
until f0d703bce77ec6b943314c24b9d480a55608c5a8
  • Loading branch information
targos authored and nodejs-ci committed Nov 20, 2018
1 parent 7bc3ce4 commit 0b2a344
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 15 deletions.
13 changes: 11 additions & 2 deletions deps/v8/gypfiles/features.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@

'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,

'v8_object_print%': 0,
Expand Down Expand Up @@ -127,8 +133,8 @@

'conditions': [
# V8's predicate inverted since we default to 'true' and set 'false' for unsupported cases.
# v8_use_snapshot && !is_aix && ( !is_win || is_clang)
['not (v8_use_snapshot=="true" and OS!="aix" and (OS!="win" or clang==1))', {
# !is_aix
['not (OS!="aix")', {
'variables': {
'v8_enable_embedded_builtins': 'false',
}
Expand Down Expand Up @@ -212,6 +218,9 @@
'V8_EMBEDDED_BYTECODE_HANDLERS',
],
}],
['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 @@ -97,7 +97,7 @@
],
'action': [
'python',
'<(protocol_path)/CheckProtocolCompatibility.py',
'<(protocol_path)/check_protocol_compatibility.py',
'--stamp', '<@(_outputs)',
'<(inspector_path)/js_protocol.json',
],
Expand Down
27 changes: 15 additions & 12 deletions deps/v8/gypfiles/v8.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"../src/builtins/array-slice.tq",
"../src/builtins/array-splice.tq",
"../src/builtins/array-unshift.tq",
"../src/builtins/collections.tq",
"../src/builtins/typed-array.tq",
"../src/builtins/data-view.tq",
"../src/builtins/iterator.tq",
Expand All @@ -34,23 +35,26 @@
'torque_namespaces': [
"base",
"array",
"collections",
"iterator",
"typed-array",
"data-view",
"test",
],
# Since there is no foreach in GYP we manualy unroll the following:
# foreach(module, torque_namespaces) {
# foreach(namespace, torque_namespaces) {
# outputs += [
# "$target_gen_dir/torque-generated/builtins-$module-from-dsl-gen.cc",
# "$target_gen_dir/torque-generated/builtins-$module-from-dsl-gen.h",
# "$target_gen_dir/torque-generated/builtins-$namespace-from-dsl-gen.cc",
# "$target_gen_dir/torque-generated/builtins-$namespace-from-dsl-gen.h",
# ]
# }
'torque_outputs': [
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-base-from-dsl-gen.cc',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-base-from-dsl-gen.h',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-from-dsl-gen.cc',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-from-dsl-gen.h',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-collections-from-dsl-gen.cc',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-collections-from-dsl-gen.h',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-iterator-from-dsl-gen.cc',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-iterator-from-dsl-gen.h',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
Expand Down Expand Up @@ -142,6 +146,7 @@
'v8_target_cpu=<(v8_target_arch)',
'v8_use_snapshot=<(v8_use_snapshot)',
'v8_enable_embedded_builtins=<(v8_enable_embedded_builtins)',
'v8_enable_jitless_mode=<(v8_enable_jitless_mode)',
'v8_enable_verify_csa=<(v8_enable_verify_csa)',
'v8_enable_lite_mode=<(v8_enable_lite_mode)',
]
Expand Down Expand Up @@ -444,11 +449,11 @@
'conditions': [
['v8_enable_embedded_builtins == "true"', {
# In this case we use `embedded_variant "Default"`
# and `suffix = ''` for the template `embedded${suffix}.cc`.
'outputs': [ '<(INTERMEDIATE_DIR)/embedded.cc' ],
# and `suffix = ''` for the template `embedded${suffix}.S`.
'outputs': [ '<(INTERMEDIATE_DIR)/embedded.S' ],
'variables': {
'mksnapshot_flags': [
'--embedded_src', '<(INTERMEDIATE_DIR)/embedded.cc',
'--embedded_src', '<(INTERMEDIATE_DIR)/embedded.S',
'--embedded_variant', 'Default',
],
},
Expand Down Expand Up @@ -619,13 +624,10 @@
'../src/ast/ast-value-factory.h',
'../src/ast/ast.cc',
'../src/ast/ast.h',
'../src/ast/context-slot-cache.cc',
'../src/ast/context-slot-cache.h',
'../src/ast/modules.cc',
'../src/ast/modules.h',
'../src/ast/prettyprinter.cc',
'../src/ast/prettyprinter.h',
'../src/ast/scopes-inl.h',
'../src/ast/scopes.cc',
'../src/ast/scopes.h',
'../src/ast/variables.cc',
Expand Down Expand Up @@ -1124,8 +1126,6 @@
'../src/icu_util.h',
'../src/identity-map.cc',
'../src/identity-map.h',
'../src/instruction-stream.cc',
'../src/instruction-stream.h',
'../src/interface-descriptors.cc',
'../src/interface-descriptors.h',
'../src/interpreter/block-coverage-builder.h',
Expand Down Expand Up @@ -1500,7 +1500,8 @@
'../src/snapshot/deserializer-allocator.h',
'../src/snapshot/deserializer.cc',
'../src/snapshot/deserializer.h',
'../src/snapshot/macros.h',
'../src/snapshot/embedded-data.cc',
'../src/snapshot/embedded-data.h',
'../src/snapshot/natives-common.cc',
'../src/snapshot/natives.h',
'../src/snapshot/object-deserializer.cc',
Expand Down Expand Up @@ -2839,6 +2840,8 @@
'<(DEPTH)',
],
'sources': [
'../src/snapshot/embedded-file-writer.cc',
'../src/snapshot/embedded-file-writer.h',
'../src/snapshot/mksnapshot.cc',
],
'conditions': [
Expand Down

0 comments on commit 0b2a344

Please sign in to comment.