Skip to content

Commit

Permalink
deps: update v8.gyp
Browse files Browse the repository at this point in the history 
Synchronize source files list with upstream's BUILD.gn.

PR-URL: #21983
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
  • Loading branch information
@targos
targos committed Sep 7, 2018
1 parent 2e28090 commit f04ab3c
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 25 deletions.
2 changes: 1 addition & 1 deletion common.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.0',
'v8_embedder_string': '-node.1',

# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,
Expand Down
10 changes: 6 additions & 4 deletions deps/v8/gypfiles/d8.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@
'<(DEPTH)',
],
'sources': [
'../src/d8.h',
'../src/d8.cc',
'../src/d8-console.h',
'../src/d8-console.cc',
'<(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.cc',
'../src/d8.h',
],
'conditions': [
[ 'want_separate_host_toolset==1', {
Expand Down
90 changes: 70 additions & 20 deletions deps/v8/gypfiles/v8.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@
}, {
'toolsets': ['target'],
}],
['v8_enable_i18n_support==1', {
'dependencies': [
'<(icu_gyp_path):icui18n',
'<(icu_gyp_path):icuuc',
],
}],
],
},
{
Expand Down Expand Up @@ -168,6 +174,7 @@
'../src/builtins/builtins-constructor-gen.h',
'../src/builtins/builtins-constructor.h',
'../src/builtins/builtins-conversion-gen.cc',
'../src/builtins/builtins-data-view-gen.h',
'../src/builtins/builtins-date-gen.cc',
'../src/builtins/builtins-debug-gen.cc',
'../src/builtins/builtins-function-gen.cc',
Expand All @@ -178,8 +185,10 @@
'../src/builtins/builtins-internal-gen.cc',
'../src/builtins/builtins-interpreter-gen.cc',
'../src/builtins/builtins-intl-gen.cc',
'../src/builtins/builtins-iterator-gen.h',
'../src/builtins/builtins-iterator-gen.cc',
'../src/builtins/builtins-iterator-gen.h',
'../src/builtins/builtins-lazy-gen.cc',
'../src/builtins/builtins-lazy-gen.h',
'../src/builtins/builtins-math-gen.cc',
'../src/builtins/builtins-math-gen.h',
'../src/builtins/builtins-number-gen.cc',
Expand Down Expand Up @@ -223,6 +232,8 @@
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-base-from-dsl-gen.h',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-data-view-from-dsl-gen.cc',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-data-view-from-dsl-gen.h',
],
'conditions': [
['want_separate_host_toolset==1', {
Expand Down Expand Up @@ -270,7 +281,12 @@
'../src/builtins/s390/builtins-s390.cc',
],
}],
['v8_enable_i18n_support==0', {
['v8_enable_i18n_support==1', {
'dependencies': [
'<(icu_gyp_path):icui18n',
'<(icu_gyp_path):icuuc',
],
}, {
'sources!': [
'../src/builtins/builtins-intl-gen.cc',
],
Expand Down Expand Up @@ -304,6 +320,13 @@
],
},
}],
['v8_enable_i18n_support==1', {
'dependencies': [
'<(icu_gyp_path):icui18n',
'<(icu_gyp_path):icuuc',
],
}],

],
'dependencies': [
'v8_base',
Expand All @@ -313,11 +336,12 @@
'<(DEPTH)',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
'<(SHARED_INTERMEDIATE_DIR)/experimental-extras-libraries.cc',
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
'<(INTERMEDIATE_DIR)/snapshot.cc',
'../src/setup-isolate-deserialize.cc',
'../src/snapshot/embedded-empty.cc',
],
'actions': [
{
Expand Down Expand Up @@ -373,9 +397,10 @@
'<(DEPTH)',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
'<(SHARED_INTERMEDIATE_DIR)/experimental-extras-libraries.cc',
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
'../src/snapshot/embedded-empty.cc',
'../src/snapshot/snapshot-empty.cc',
],
'conditions': [
Expand All @@ -391,6 +416,12 @@
'BUILDING_V8_SHARED',
],
}],
['v8_enable_i18n_support==1', {
'dependencies': [
'<(icu_gyp_path):icui18n',
'<(icu_gyp_path):icuuc',
],
}],
]
},
{
Expand Down Expand Up @@ -433,6 +464,7 @@
],
'sources': [
'../src/setup-isolate-deserialize.cc',
'../src/snapshot/embedded-empty.cc',
'../src/snapshot/natives-external.cc',
'../src/snapshot/snapshot-external.cc',
],
Expand Down Expand Up @@ -587,8 +619,6 @@
'../src/ast/ast-value-factory.h',
'../src/ast/ast.cc',
'../src/ast/ast.h',
'../src/ast/compile-time-value.cc',
'../src/ast/compile-time-value.h',
'../src/ast/context-slot-cache.cc',
'../src/ast/context-slot-cache.h',
'../src/ast/modules.cc',
Expand Down Expand Up @@ -669,13 +699,12 @@
'../src/code-stubs-utils.h',
'../src/code-stubs.cc',
'../src/code-stubs.h',
'../src/code-tracer.h',
'../src/codegen.cc',
'../src/codegen.h',
'../src/collector.h',
'../src/compilation-cache.cc',
'../src/compilation-cache.h',
'../src/compilation-dependencies.cc',
'../src/compilation-dependencies.h',
'../src/compilation-statistics.cc',
'../src/compilation-statistics.h',
'../src/compiler-dispatcher/compiler-dispatcher-job.cc',
Expand Down Expand Up @@ -721,6 +750,8 @@
'../src/compiler/common-operator-reducer.h',
'../src/compiler/common-operator.cc',
'../src/compiler/common-operator.h',
'../src/compiler/compilation-dependencies.cc',
'../src/compiler/compilation-dependencies.h',
'../src/compiler/compiler-source-position-table.cc',
'../src/compiler/compiler-source-position-table.h',
'../src/compiler/constant-folding-reducer.cc',
Expand Down Expand Up @@ -777,6 +808,8 @@
'../src/compiler/js-generic-lowering.h',
'../src/compiler/js-graph.cc',
'../src/compiler/js-graph.h',
'../src/compiler/js-heap-broker.cc',
'../src/compiler/js-heap-broker.h',
'../src/compiler/js-inlining-heuristic.cc',
'../src/compiler/js-inlining-heuristic.h',
'../src/compiler/js-inlining.cc',
Expand Down Expand Up @@ -1015,6 +1048,8 @@
'../src/heap/gc-idle-time-handler.h',
'../src/heap/gc-tracer.cc',
'../src/heap/gc-tracer.h',
'../src/heap/heap-controller.cc',
'../src/heap/heap-controller.h',
'../src/heap/heap-inl.h',
'../src/heap/heap.cc',
'../src/heap/heap.h',
Expand Down Expand Up @@ -1190,6 +1225,7 @@
'../src/objects/frame-array.h',
'../src/objects/hash-table-inl.h',
'../src/objects/hash-table.h',
'../src/objects/intl-objects-inl.h',
'../src/objects/intl-objects.cc',
'../src/objects/intl-objects.h',
'../src/objects/js-array-inl.h',
Expand All @@ -1205,6 +1241,9 @@
'../src/objects/js-regexp-string-iterator-inl.h',
'../src/objects/js-regexp-string-iterator.h',
'../src/objects/js-regexp.h',
'../src/objects/js-relative-time-format-inl.h',
'../src/objects/js-relative-time-format.cc',
'../src/objects/js-relative-time-format.h',
'../src/objects/literal-objects-inl.h',
'../src/objects/literal-objects.cc',
'../src/objects/literal-objects.h',
Expand All @@ -1230,6 +1269,8 @@
'../src/objects/promise.h',
'../src/objects/property-descriptor-object-inl.h',
'../src/objects/property-descriptor-object.h',
'../src/objects/prototype-info-inl.h',
'../src/objects/prototype-info.h',
'../src/objects/regexp-match-info.h',
'../src/objects/scope-info.cc',
'../src/objects/scope-info.h',
Expand Down Expand Up @@ -1262,7 +1303,6 @@
'../src/parsing/parsing.cc',
'../src/parsing/parsing.h',
'../src/parsing/pattern-rewriter.cc',
'../src/parsing/preparse-data-format.h',
'../src/parsing/preparse-data.cc',
'../src/parsing/preparse-data.h',
'../src/parsing/preparsed-scope-data.cc',
Expand Down Expand Up @@ -1338,6 +1378,8 @@
'../src/register-configuration.cc',
'../src/register-configuration.h',
'../src/reglist.h',
'../src/roots-inl.h',
'../src/roots.h',
'../src/runtime-profiler.cc',
'../src/runtime-profiler.h',
'../src/runtime/runtime-array.cc',
Expand All @@ -1348,7 +1390,6 @@
'../src/runtime/runtime-compiler.cc',
'../src/runtime/runtime-date.cc',
'../src/runtime/runtime-debug.cc',
'../src/runtime/runtime-error.cc',
'../src/runtime/runtime-forin.cc',
'../src/runtime/runtime-function.cc',
'../src/runtime/runtime-futex.cc',
Expand All @@ -1357,7 +1398,6 @@
'../src/runtime/runtime-interpreter.cc',
'../src/runtime/runtime-intl.cc',
'../src/runtime/runtime-literals.cc',
'../src/runtime/runtime-liveedit.cc',
'../src/runtime/runtime-maths.cc',
'../src/runtime/runtime-module.cc',
'../src/runtime/runtime-numbers.cc',
Expand Down Expand Up @@ -1409,6 +1449,7 @@
'../src/snapshot/partial-deserializer.h',
'../src/snapshot/partial-serializer.cc',
'../src/snapshot/partial-serializer.h',
'../src/snapshot/references.h',
'../src/snapshot/serializer-common.cc',
'../src/snapshot/serializer-common.h',
'../src/snapshot/serializer.cc',
Expand Down Expand Up @@ -1455,6 +1496,8 @@
'../src/trap-handler/handler-shared.cc',
'../src/trap-handler/trap-handler-internal.h',
'../src/trap-handler/trap-handler.h',
'../src/turbo-assembler.cc',
'../src/turbo-assembler.h',
'../src/type-hints.cc',
'../src/type-hints.h',
'../src/unicode-cache-inl.h',
Expand Down Expand Up @@ -1499,6 +1542,8 @@
'../src/wasm/function-body-decoder.h',
'../src/wasm/function-compiler.cc',
'../src/wasm/function-compiler.h',
'../src/wasm/jump-table-assembler.cc',
'../src/wasm/jump-table-assembler.h',
'../src/wasm/leb-helper.h',
'../src/wasm/local-decl-encoder.cc',
'../src/wasm/local-decl-encoder.h',
Expand All @@ -1515,8 +1560,6 @@
'../src/wasm/value-type.h',
'../src/wasm/wasm-code-manager.cc',
'../src/wasm/wasm-code-manager.h',
'../src/wasm/wasm-code-specialization.cc',
'../src/wasm/wasm-code-specialization.h',
'../src/wasm/wasm-constants.h',
'../src/wasm/wasm-debug.cc',
'../src/wasm/wasm-engine.cc',
Expand Down Expand Up @@ -1578,6 +1621,7 @@
'../src/ia32/assembler-ia32.h',
'../src/ia32/code-stubs-ia32.cc',
'../src/ia32/codegen-ia32.cc',
'../src/ia32/constants-ia32.h',
'../src/ia32/cpu-ia32.cc',
'../src/ia32/deoptimizer-ia32.cc',
'../src/ia32/disasm-ia32.cc',
Expand Down Expand Up @@ -1612,6 +1656,7 @@
'../src/x64/assembler-x64.h',
'../src/x64/code-stubs-x64.cc',
'../src/x64/codegen-x64.cc',
'../src/x64/constants-x64.h',
'../src/x64/cpu-x64.cc',
'../src/x64/deoptimizer-x64.cc',
'../src/x64/disasm-x64.cc',
Expand Down Expand Up @@ -1654,7 +1699,6 @@
'../src/arm/frame-constants-arm.cc',
'../src/arm/frame-constants-arm.h',
'../src/arm/interface-descriptors-arm.cc',
'../src/arm/interface-descriptors-arm.h',
'../src/arm/macro-assembler-arm.cc',
'../src/arm/macro-assembler-arm.h',
'../src/arm/simulator-arm.cc',
Expand Down Expand Up @@ -1696,7 +1740,6 @@
'../src/arm64/instrument-arm64.cc',
'../src/arm64/instrument-arm64.h',
'../src/arm64/interface-descriptors-arm64.cc',
'../src/arm64/interface-descriptors-arm64.h',
'../src/arm64/macro-assembler-arm64-inl.h',
'../src/arm64/macro-assembler-arm64.cc',
'../src/arm64/macro-assembler-arm64.h',
Expand Down Expand Up @@ -1899,11 +1942,15 @@
'../src/char-predicates.cc',
'../src/intl.cc',
'../src/intl.h',
'../src/objects/intl-objects-inl.h',
'../src/objects/intl-objects.cc',
'../src/objects/intl-objects.h',
'../src/objects/js-locale-inl.h',
'../src/objects/js-locale.cc',
'../src/objects/js-locale.h',
'../src/objects/js-relative-time-format-inl.h',
'../src/objects/js-relative-time-format.cc',
'../src/objects/js-relative-time-format.h',
'../src/runtime/runtime-intl.cc',
],
}],
Expand Down Expand Up @@ -1959,6 +2006,7 @@
'../src/base/ieee754.h',
'../src/base/iterator.h',
'../src/base/lazy-instance.h',
'../src/base/list.h',
'../src/base/logging.cc',
'../src/base/logging.h',
'../src/base/macros.h',
Expand Down Expand Up @@ -2406,9 +2454,6 @@
'../src/js/prologue.js',
'../src/js/array.js',
'../src/js/typedarray.js',
'../src/debug/mirrors.js',
'../src/debug/debug.js',
'../src/debug/liveedit.js',
],
'libraries_bin_file': '<(SHARED_INTERMEDIATE_DIR)/libraries.bin',
'libraries_extras_bin_file': '<(SHARED_INTERMEDIATE_DIR)/libraries-extras.bin',
Expand Down Expand Up @@ -2912,7 +2957,10 @@
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
'../src/builtins/base.tq',
'../src/builtins/array.tq',
'../src/builtins/array-foreach.tq',
'../src/builtins/array-sort.tq',
'../src/builtins/typed-array.tq',
'../src/builtins/data-view.tq',
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtin-definitions-from-dsl.h',
Expand All @@ -2922,6 +2970,8 @@
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-base-from-dsl-gen.h',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-data-view-from-dsl-gen.cc',
'<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-data-view-from-dsl-gen.h',
],
'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
},
Expand Down

0 comments on commit f04ab3c

Please sign in to comment.