From 3f363ea93a6ffd31dfa3687946f1148bb59c5718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sun, 29 Jul 2018 16:18:31 +0200 Subject: [PATCH 1/2] deps: refactor v8.gyp Mostly reorders lists of source files to match more BUILD.gn. Fixes a few wrong entries. --- common.gypi | 2 +- deps/v8/gypfiles/v8.gyp | 540 ++++++++++++++++++++-------------------- 2 files changed, 271 insertions(+), 271 deletions(-) diff --git a/common.gypi b/common.gypi index ef462da16117c3..1cc96a31d5d078 100644 --- a/common.gypi +++ b/common.gypi @@ -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.12', + 'v8_embedder_string': '-node.13', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index 08abec1c3e5a35..29dd25d164025a 100644 --- a/deps/v8/gypfiles/v8.gyp +++ b/deps/v8/gypfiles/v8.gyp @@ -535,7 +535,8 @@ ], 'sources': [ '<@(inspector_all_sources)', - '../include//v8-debug.h', + '../include//v8-inspector-protocol.h', + '../include//v8-inspector.h', '../include//v8-platform.h', '../include//v8-profiler.h', '../include//v8-testing.h', @@ -549,15 +550,15 @@ '../src/accessors.h', '../src/address-map.cc', '../src/address-map.h', + '../src/allocation-site-scopes.h', '../src/allocation.cc', '../src/allocation.h', - '../src/allocation-site-scopes.h', - '../src/api.cc', - '../src/api.h', '../src/api-arguments-inl.h', '../src/api-arguments.h', '../src/api-natives.cc', '../src/api-natives.h', + '../src/api.cc', + '../src/api.h', '../src/arguments.cc', '../src/arguments.h', '../src/asan.h', @@ -576,8 +577,8 @@ '../src/assembler-inl.h', '../src/assembler.cc', '../src/assembler.h', - '../src/assert-scope.h', '../src/assert-scope.cc', + '../src/assert-scope.h', '../src/ast/ast-function-literal-id-reindexer.cc', '../src/ast/ast-function-literal-id-reindexer.h', '../src/ast/ast-source-ranges.h', @@ -612,8 +613,8 @@ '../src/bootstrapper.h', '../src/boxed-float.h', '../src/builtins/builtins-api.cc', - '../src/builtins/builtins-arraybuffer.cc', '../src/builtins/builtins-array.cc', + '../src/builtins/builtins-arraybuffer.cc', '../src/builtins/builtins-bigint.cc', '../src/builtins/builtins-boolean.cc', '../src/builtins/builtins-call.cc', @@ -630,6 +631,8 @@ '../src/builtins/builtins-global.cc', '../src/builtins/builtins-internal.cc', '../src/builtins/builtins-interpreter.cc', + '../src/builtins/builtins-intl.cc', + '../src/builtins/builtins-intl.h', '../src/builtins/builtins-json.cc', '../src/builtins/builtins-math.cc', '../src/builtins/builtins-number.cc', @@ -639,8 +642,6 @@ '../src/builtins/builtins-regexp.cc', '../src/builtins/builtins-sharedarraybuffer.cc', '../src/builtins/builtins-string.cc', - '../src/builtins/builtins-intl.cc', - '../src/builtins/builtins-intl.h', '../src/builtins/builtins-symbol.cc', '../src/builtins/builtins-trace.cc', '../src/builtins/builtins-typed-array.cc', @@ -654,8 +655,8 @@ '../src/callable.h', '../src/cancelable-task.cc', '../src/cancelable-task.h', - '../src/char-predicates.cc', '../src/char-predicates-inl.h', + '../src/char-predicates.cc', '../src/char-predicates.h', '../src/checks.h', '../src/code-events.h', @@ -665,9 +666,9 @@ '../src/code-reference.h', '../src/code-stub-assembler.cc', '../src/code-stub-assembler.h', + '../src/code-stubs-utils.h', '../src/code-stubs.cc', '../src/code-stubs.h', - '../src/code-stubs-utils.h', '../src/codegen.cc', '../src/codegen.h', '../src/collector.h', @@ -677,6 +678,18 @@ '../src/compilation-dependencies.h', '../src/compilation-statistics.cc', '../src/compilation-statistics.h', + '../src/compiler-dispatcher/compiler-dispatcher-job.cc', + '../src/compiler-dispatcher/compiler-dispatcher-job.h', + '../src/compiler-dispatcher/compiler-dispatcher-tracer.cc', + '../src/compiler-dispatcher/compiler-dispatcher-tracer.h', + '../src/compiler-dispatcher/compiler-dispatcher.cc', + '../src/compiler-dispatcher/compiler-dispatcher.h', + '../src/compiler-dispatcher/optimizing-compile-dispatcher.cc', + '../src/compiler-dispatcher/optimizing-compile-dispatcher.h', + '../src/compiler-dispatcher/unoptimized-compile-job.cc', + '../src/compiler-dispatcher/unoptimized-compile-job.h', + '../src/compiler.cc', + '../src/compiler.h', '../src/compiler/access-builder.cc', '../src/compiler/access-builder.h', '../src/compiler/access-info.cc', @@ -697,11 +710,11 @@ '../src/compiler/c-linkage.cc', '../src/compiler/checkpoint-elimination.cc', '../src/compiler/checkpoint-elimination.h', + '../src/compiler/code-assembler.cc', + '../src/compiler/code-assembler.h', '../src/compiler/code-generator-impl.h', '../src/compiler/code-generator.cc', '../src/compiler/code-generator.h', - '../src/compiler/code-assembler.cc', - '../src/compiler/code-assembler.h', '../src/compiler/common-node-cache.cc', '../src/compiler/common-node-cache.h', '../src/compiler/common-operator-reducer.cc', @@ -721,16 +734,16 @@ '../src/compiler/diamond.h', '../src/compiler/effect-control-linearizer.cc', '../src/compiler/effect-control-linearizer.h', - '../src/compiler/escape-analysis.cc', - '../src/compiler/escape-analysis.h', '../src/compiler/escape-analysis-reducer.cc', '../src/compiler/escape-analysis-reducer.h', - '../src/compiler/frame.cc', - '../src/compiler/frame.h', + '../src/compiler/escape-analysis.cc', + '../src/compiler/escape-analysis.h', '../src/compiler/frame-elider.cc', '../src/compiler/frame-elider.h', '../src/compiler/frame-states.cc', '../src/compiler/frame-states.h', + '../src/compiler/frame.cc', + '../src/compiler/frame.h', '../src/compiler/functional-list.h', '../src/compiler/gap-resolver.cc', '../src/compiler/gap-resolver.h', @@ -745,11 +758,11 @@ '../src/compiler/graph.cc', '../src/compiler/graph.h', '../src/compiler/instruction-codes.h', + '../src/compiler/instruction-scheduler.cc', + '../src/compiler/instruction-scheduler.h', '../src/compiler/instruction-selector-impl.h', '../src/compiler/instruction-selector.cc', '../src/compiler/instruction-selector.h', - '../src/compiler/instruction-scheduler.cc', - '../src/compiler/instruction-scheduler.h', '../src/compiler/instruction.cc', '../src/compiler/instruction.h', '../src/compiler/int64-lowering.cc', @@ -764,10 +777,10 @@ '../src/compiler/js-generic-lowering.h', '../src/compiler/js-graph.cc', '../src/compiler/js-graph.h', - '../src/compiler/js-inlining.cc', - '../src/compiler/js-inlining.h', '../src/compiler/js-inlining-heuristic.cc', '../src/compiler/js-inlining-heuristic.h', + '../src/compiler/js-inlining.cc', + '../src/compiler/js-inlining.h', '../src/compiler/js-intrinsic-lowering.cc', '../src/compiler/js-intrinsic-lowering.h', '../src/compiler/js-native-context-specialization.cc', @@ -828,20 +841,20 @@ '../src/compiler/osr.cc', '../src/compiler/osr.h', '../src/compiler/persistent-map.h', - '../src/compiler/pipeline.cc', - '../src/compiler/pipeline.h', '../src/compiler/pipeline-statistics.cc', '../src/compiler/pipeline-statistics.h', + '../src/compiler/pipeline.cc', + '../src/compiler/pipeline.h', '../src/compiler/property-access-builder.cc', '../src/compiler/property-access-builder.h', '../src/compiler/raw-machine-assembler.cc', '../src/compiler/raw-machine-assembler.h', '../src/compiler/redundancy-elimination.cc', '../src/compiler/redundancy-elimination.h', - '../src/compiler/register-allocator.cc', - '../src/compiler/register-allocator.h', '../src/compiler/register-allocator-verifier.cc', '../src/compiler/register-allocator-verifier.h', + '../src/compiler/register-allocator.cc', + '../src/compiler/register-allocator.h', '../src/compiler/representation-change.cc', '../src/compiler/representation-change.h', '../src/compiler/schedule.cc', @@ -881,18 +894,6 @@ '../src/compiler/wasm-compiler.h', '../src/compiler/zone-stats.cc', '../src/compiler/zone-stats.h', - '../src/compiler-dispatcher/compiler-dispatcher.cc', - '../src/compiler-dispatcher/compiler-dispatcher.h', - '../src/compiler-dispatcher/compiler-dispatcher-job.cc', - '../src/compiler-dispatcher/compiler-dispatcher-job.h', - '../src/compiler-dispatcher/compiler-dispatcher-tracer.cc', - '../src/compiler-dispatcher/compiler-dispatcher-tracer.h', - '../src/compiler-dispatcher/optimizing-compile-dispatcher.cc', - '../src/compiler-dispatcher/optimizing-compile-dispatcher.h', - '../src/compiler-dispatcher/unoptimized-compile-job.cc', - '../src/compiler-dispatcher/unoptimized-compile-job.h', - '../src/compiler.cc', - '../src/compiler.h', '../src/contexts-inl.h', '../src/contexts.cc', '../src/contexts.h', @@ -911,9 +912,9 @@ '../src/debug/debug-coverage.h', '../src/debug/debug-evaluate.cc', '../src/debug/debug-evaluate.h', - '../src/debug/debug-interface.h', '../src/debug/debug-frames.cc', '../src/debug/debug-frames.h', + '../src/debug/debug-interface.h', '../src/debug/debug-scope-iterator.cc', '../src/debug/debug-scope-iterator.h', '../src/debug/debug-scopes.cc', @@ -969,8 +970,8 @@ '../src/feedback-vector-inl.h', '../src/feedback-vector.cc', '../src/feedback-vector.h', - '../src/field-index.h', '../src/field-index-inl.h', + '../src/field-index.h', '../src/field-type.cc', '../src/field-type.h', '../src/fixed-dtoa.cc', @@ -1010,8 +1011,6 @@ '../src/heap/factory-inl.h', '../src/heap/factory.cc', '../src/heap/factory.h', - '../src/heap/memory-reducer.cc', - '../src/heap/memory-reducer.h', '../src/heap/gc-idle-time-handler.cc', '../src/heap/gc-idle-time-handler.h', '../src/heap/gc-tracer.cc', @@ -1035,14 +1034,16 @@ '../src/heap/mark-compact.h', '../src/heap/marking.cc', '../src/heap/marking.h', + '../src/heap/memory-reducer.cc', + '../src/heap/memory-reducer.h', '../src/heap/object-stats.cc', '../src/heap/object-stats.h', '../src/heap/objects-visiting-inl.h', '../src/heap/objects-visiting.cc', '../src/heap/objects-visiting.h', '../src/heap/remembered-set.h', - '../src/heap/scavenge-job.h', '../src/heap/scavenge-job.cc', + '../src/heap/scavenge-job.h', '../src/heap/scavenger-inl.h', '../src/heap/scavenger.cc', '../src/heap/scavenger.h', @@ -1059,20 +1060,20 @@ '../src/heap/sweeper.cc', '../src/heap/sweeper.h', '../src/heap/worklist.h', - '../src/intl.cc', - '../src/intl.h', - '../src/icu_util.cc', - '../src/icu_util.h', '../src/ic/call-optimization.cc', '../src/ic/call-optimization.h', - '../src/ic/handler-configuration.cc', '../src/ic/handler-configuration-inl.h', + '../src/ic/handler-configuration.cc', '../src/ic/handler-configuration.h', '../src/ic/ic-inl.h', '../src/ic/ic-stats.cc', '../src/ic/ic-stats.h', '../src/ic/ic.cc', '../src/ic/ic.h', + '../src/ic/stub-cache.cc', + '../src/ic/stub-cache.h', + '../src/icu_util.cc', + '../src/icu_util.h', '../src/identity-map.cc', '../src/identity-map.h', '../src/instruction-stream.cc', @@ -1080,8 +1081,6 @@ '../src/interface-descriptors.cc', '../src/interface-descriptors.h', '../src/interpreter/block-coverage-builder.h', - '../src/interpreter/bytecodes.cc', - '../src/interpreter/bytecodes.h', '../src/interpreter/bytecode-array-accessor.cc', '../src/interpreter/bytecode-array-accessor.h', '../src/interpreter/bytecode-array-builder.cc', @@ -1098,32 +1097,36 @@ '../src/interpreter/bytecode-flags.h', '../src/interpreter/bytecode-generator.cc', '../src/interpreter/bytecode-generator.h', + '../src/interpreter/bytecode-jump-table.h', '../src/interpreter/bytecode-label.cc', '../src/interpreter/bytecode-label.h', '../src/interpreter/bytecode-node.cc', '../src/interpreter/bytecode-node.h', '../src/interpreter/bytecode-operands.cc', '../src/interpreter/bytecode-operands.h', - '../src/interpreter/bytecode-register.cc', - '../src/interpreter/bytecode-register.h', '../src/interpreter/bytecode-register-allocator.h', '../src/interpreter/bytecode-register-optimizer.cc', '../src/interpreter/bytecode-register-optimizer.h', + '../src/interpreter/bytecode-register.cc', + '../src/interpreter/bytecode-register.h', '../src/interpreter/bytecode-source-info.cc', '../src/interpreter/bytecode-source-info.h', - '../src/interpreter/bytecode-jump-table.h', '../src/interpreter/bytecode-traits.h', + '../src/interpreter/bytecodes.cc', + '../src/interpreter/bytecodes.h', '../src/interpreter/constant-array-builder.cc', '../src/interpreter/constant-array-builder.h', '../src/interpreter/control-flow-builders.cc', '../src/interpreter/control-flow-builders.h', '../src/interpreter/handler-table-builder.cc', '../src/interpreter/handler-table-builder.h', - '../src/interpreter/interpreter.cc', - '../src/interpreter/interpreter.h', '../src/interpreter/interpreter-generator.h', '../src/interpreter/interpreter-intrinsics.cc', '../src/interpreter/interpreter-intrinsics.h', + '../src/interpreter/interpreter.cc', + '../src/interpreter/interpreter.h', + '../src/intl.cc', + '../src/intl.h', '../src/isolate-inl.h', '../src/isolate.cc', '../src/isolate.h', @@ -1131,8 +1134,8 @@ '../src/json-parser.h', '../src/json-stringifier.cc', '../src/json-stringifier.h', - '../src/keys.h', '../src/keys.cc', + '../src/keys.h', '../src/label.h', '../src/layout-descriptor-inl.h', '../src/layout-descriptor.cc', @@ -1174,19 +1177,17 @@ '../src/objects/bigint.h', '../src/objects/code-inl.h', '../src/objects/code.h', - '../src/objects/compilation-cache.h', '../src/objects/compilation-cache-inl.h', - '../src/objects/data-handler.h', - '../src/objects/data-handler-inl.h', + '../src/objects/compilation-cache.h', '../src/objects/debug-objects-inl.h', '../src/objects/debug-objects.cc', '../src/objects/debug-objects.h', '../src/objects/descriptor-array.h', '../src/objects/dictionary.h', - '../src/objects/fixed-array.h', '../src/objects/fixed-array-inl.h', - '../src/objects/frame-array.h', + '../src/objects/fixed-array.h', '../src/objects/frame-array-inl.h', + '../src/objects/frame-array.h', '../src/objects/hash-table-inl.h', '../src/objects/hash-table.h', '../src/objects/intl-objects.cc', @@ -1201,9 +1202,9 @@ '../src/objects/js-promise-inl.h', '../src/objects/js-promise.h', '../src/objects/js-regexp-inl.h', - '../src/objects/js-regexp.h', '../src/objects/js-regexp-string-iterator-inl.h', '../src/objects/js-regexp-string-iterator.h', + '../src/objects/js-regexp.h', '../src/objects/literal-objects-inl.h', '../src/objects/literal-objects.cc', '../src/objects/literal-objects.h', @@ -1232,13 +1233,13 @@ '../src/objects/regexp-match-info.h', '../src/objects/scope-info.cc', '../src/objects/scope-info.h', - '../src/objects/script.h', '../src/objects/script-inl.h', + '../src/objects/script.h', '../src/objects/shared-function-info-inl.h', '../src/objects/shared-function-info.h', '../src/objects/string-inl.h', - '../src/objects/string.h', '../src/objects/string-table.h', + '../src/objects/string.h', '../src/objects/template-objects.cc', '../src/objects/template-objects.h', '../src/objects/templates-inl.h', @@ -1292,11 +1293,11 @@ '../src/profiler/heap-snapshot-generator-inl.h', '../src/profiler/heap-snapshot-generator.cc', '../src/profiler/heap-snapshot-generator.h', - '../src/profiler/profiler-listener.cc', - '../src/profiler/profiler-listener.h', '../src/profiler/profile-generator-inl.h', '../src/profiler/profile-generator.cc', '../src/profiler/profile-generator.h', + '../src/profiler/profiler-listener.cc', + '../src/profiler/profiler-listener.h', '../src/profiler/sampling-heap-profiler.cc', '../src/profiler/sampling-heap-profiler.h', '../src/profiler/strings-storage.cc', @@ -1347,14 +1348,14 @@ '../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-error.cc', '../src/runtime/runtime-futex.cc', '../src/runtime/runtime-generator.cc', - '../src/runtime/runtime-intl.cc', '../src/runtime/runtime-internal.cc', '../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', @@ -1399,6 +1400,7 @@ '../src/snapshot/default-serializer-allocator.h', '../src/snapshot/deserializer.cc', '../src/snapshot/deserializer.h', + '../src/snapshot/macros.h', '../src/snapshot/natives-common.cc', '../src/snapshot/natives.h', '../src/snapshot/object-deserializer.cc', @@ -1407,14 +1409,14 @@ '../src/snapshot/partial-deserializer.h', '../src/snapshot/partial-serializer.cc', '../src/snapshot/partial-serializer.h', - '../src/snapshot/serializer.cc', '../src/snapshot/serializer-common.cc', '../src/snapshot/serializer-common.h', + '../src/snapshot/serializer.cc', '../src/snapshot/serializer.h', '../src/snapshot/snapshot-common.cc', - '../src/snapshot/snapshot.h', '../src/snapshot/snapshot-source-sink.cc', '../src/snapshot/snapshot-source-sink.h', + '../src/snapshot/snapshot.h', '../src/snapshot/startup-deserializer.cc', '../src/snapshot/startup-deserializer.h', '../src/snapshot/startup-serializer.cc', @@ -1423,8 +1425,8 @@ '../src/source-position-table.h', '../src/source-position.cc', '../src/source-position.h', - '../src/splay-tree.h', '../src/splay-tree-inl.h', + '../src/splay-tree.h', '../src/startup-data-util.cc', '../src/startup-data-util.h', '../src/string-builder.cc', @@ -1438,8 +1440,6 @@ '../src/string-stream.h', '../src/strtod.cc', '../src/strtod.h', - '../src/ic/stub-cache.cc', - '../src/ic/stub-cache.h', '../src/third_party/utf8-decoder/utf8-decoder.h', '../src/tracing/trace-event.cc', '../src/tracing/trace-event.h', @@ -1453,8 +1453,8 @@ '../src/trap-handler/handler-inside.cc', '../src/trap-handler/handler-outside.cc', '../src/trap-handler/handler-shared.cc', - '../src/trap-handler/trap-handler.h', '../src/trap-handler/trap-handler-internal.h', + '../src/trap-handler/trap-handler.h', '../src/type-hints.cc', '../src/type-hints.h', '../src/unicode-cache-inl.h', @@ -1497,8 +1497,8 @@ '../src/wasm/function-body-decoder-impl.h', '../src/wasm/function-body-decoder.cc', '../src/wasm/function-body-decoder.h', - '../src/wasm/function-compiler.h', '../src/wasm/function-compiler.cc', + '../src/wasm/function-compiler.h', '../src/wasm/leb-helper.h', '../src/wasm/local-decl-encoder.cc', '../src/wasm/local-decl-encoder.h', @@ -1523,18 +1523,18 @@ '../src/wasm/wasm-engine.h', '../src/wasm/wasm-external-refs.cc', '../src/wasm/wasm-external-refs.h', + '../src/wasm/wasm-interpreter.cc', + '../src/wasm/wasm-interpreter.h', '../src/wasm/wasm-js.cc', '../src/wasm/wasm-js.h', '../src/wasm/wasm-limits.h', '../src/wasm/wasm-linkage.h', '../src/wasm/wasm-memory.cc', '../src/wasm/wasm-memory.h', - '../src/wasm/wasm-module.cc', - '../src/wasm/wasm-module.h', '../src/wasm/wasm-module-builder.cc', '../src/wasm/wasm-module-builder.h', - '../src/wasm/wasm-interpreter.cc', - '../src/wasm/wasm-interpreter.h', + '../src/wasm/wasm-module.cc', + '../src/wasm/wasm-module.h', '../src/wasm/wasm-objects-inl.h', '../src/wasm/wasm-objects.cc', '../src/wasm/wasm-objects.h', @@ -1549,17 +1549,15 @@ '../src/wasm/wasm-value.h', '../src/zone/accounting-allocator.cc', '../src/zone/accounting-allocator.h', - '../src/zone/zone-segment.cc', - '../src/zone/zone-segment.h', - '../src/zone/zone.cc', - '../src/zone/zone.h', - '../src/zone/zone-chunk-list.h', - '../src/zone/zone-segment.cc', - '../src/zone/zone-segment.h', '../src/zone/zone-allocator.h', + '../src/zone/zone-chunk-list.h', '../src/zone/zone-containers.h', '../src/zone/zone-handle-set.h', '../src/zone/zone-list-inl.h', + '../src/zone/zone-segment.cc', + '../src/zone/zone-segment.h', + '../src/zone/zone.cc', + '../src/zone/zone.h', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtin-definitions-from-dsl.h', ], 'conditions': [ @@ -1568,6 +1566,77 @@ }, { 'toolsets': ['target'], }], + ['v8_target_arch=="ia32"', { + 'sources': [ + '../src/compiler/ia32/code-generator-ia32.cc', + '../src/compiler/ia32/instruction-codes-ia32.h', + '../src/compiler/ia32/instruction-scheduler-ia32.cc', + '../src/compiler/ia32/instruction-selector-ia32.cc', + '../src/debug/ia32/debug-ia32.cc', + '../src/ia32/assembler-ia32-inl.h', + '../src/ia32/assembler-ia32.cc', + '../src/ia32/assembler-ia32.h', + '../src/ia32/code-stubs-ia32.cc', + '../src/ia32/codegen-ia32.cc', + '../src/ia32/cpu-ia32.cc', + '../src/ia32/deoptimizer-ia32.cc', + '../src/ia32/disasm-ia32.cc', + '../src/ia32/frame-constants-ia32.cc', + '../src/ia32/frame-constants-ia32.h', + '../src/ia32/interface-descriptors-ia32.cc', + '../src/ia32/macro-assembler-ia32.cc', + '../src/ia32/macro-assembler-ia32.h', + '../src/ia32/simulator-ia32.cc', + '../src/ia32/simulator-ia32.h', + '../src/ia32/sse-instr.h', + '../src/regexp/ia32/regexp-macro-assembler-ia32.cc', + '../src/regexp/ia32/regexp-macro-assembler-ia32.h', + '../src/wasm/baseline/ia32/liftoff-assembler-ia32.h', + ], + }], + ['v8_target_arch=="x64"', { + 'sources': [ + '../src/compiler/x64/code-generator-x64.cc', + '../src/compiler/x64/instruction-codes-x64.h', + '../src/compiler/x64/instruction-scheduler-x64.cc', + '../src/compiler/x64/instruction-selector-x64.cc', + '../src/compiler/x64/unwinding-info-writer-x64.cc', + '../src/compiler/x64/unwinding-info-writer-x64.h', + '../src/debug/x64/debug-x64.cc', + '../src/regexp/x64/regexp-macro-assembler-x64.cc', + '../src/regexp/x64/regexp-macro-assembler-x64.h', + '../src/third_party/valgrind/valgrind.h', + '../src/wasm/baseline/x64/liftoff-assembler-x64.h', + '../src/x64/assembler-x64-inl.h', + '../src/x64/assembler-x64.cc', + '../src/x64/assembler-x64.h', + '../src/x64/code-stubs-x64.cc', + '../src/x64/codegen-x64.cc', + '../src/x64/cpu-x64.cc', + '../src/x64/deoptimizer-x64.cc', + '../src/x64/disasm-x64.cc', + '../src/x64/eh-frame-x64.cc', + '../src/x64/frame-constants-x64.cc', + '../src/x64/frame-constants-x64.h', + '../src/x64/interface-descriptors-x64.cc', + '../src/x64/macro-assembler-x64.cc', + '../src/x64/macro-assembler-x64.h', + '../src/x64/simulator-x64.cc', + '../src/x64/simulator-x64.h', + '../src/x64/sse-instr.h', + ], + }], + ['v8_target_arch=="x64" and OS=="linux"', { + 'sources': [ + '../src/trap-handler/handler-inside-linux.cc', + '../src/trap-handler/handler-outside-linux.cc', + ], + }], + ['v8_target_arch=="x64" and OS=="win"', { + 'sources': [ + '../src/trap-handler/handler-outside-win.cc', + ], + }], ['v8_target_arch=="arm"', { 'sources': [ '../src/arm/assembler-arm-inl.h', @@ -1581,6 +1650,7 @@ '../src/arm/cpu-arm.cc', '../src/arm/deoptimizer-arm.cc', '../src/arm/disasm-arm.cc', + '../src/arm/eh-frame-arm.cc', '../src/arm/frame-constants-arm.cc', '../src/arm/frame-constants-arm.h', '../src/arm/interface-descriptors-arm.cc', @@ -1589,7 +1659,6 @@ '../src/arm/macro-assembler-arm.h', '../src/arm/simulator-arm.cc', '../src/arm/simulator-arm.h', - '../src/arm/eh-frame-arm.cc', '../src/compiler/arm/code-generator-arm.cc', '../src/compiler/arm/instruction-codes-arm.h', '../src/compiler/arm/instruction-scheduler-arm.cc', @@ -1604,20 +1673,21 @@ }], ['v8_target_arch=="arm64"', { 'sources': [ + '../src/arm64/assembler-arm64-inl.h', '../src/arm64/assembler-arm64.cc', '../src/arm64/assembler-arm64.h', - '../src/arm64/assembler-arm64-inl.h', - '../src/arm64/codegen-arm64.cc', '../src/arm64/code-stubs-arm64.cc', '../src/arm64/code-stubs-arm64.h', + '../src/arm64/codegen-arm64.cc', '../src/arm64/constants-arm64.h', '../src/arm64/cpu-arm64.cc', + '../src/arm64/decoder-arm64-inl.h', '../src/arm64/decoder-arm64.cc', '../src/arm64/decoder-arm64.h', - '../src/arm64/decoder-arm64-inl.h', '../src/arm64/deoptimizer-arm64.cc', '../src/arm64/disasm-arm64.cc', '../src/arm64/disasm-arm64.h', + '../src/arm64/eh-frame-arm64.cc', '../src/arm64/frame-constants-arm64.cc', '../src/arm64/frame-constants-arm64.h', '../src/arm64/instructions-arm64-constants.cc', @@ -1627,63 +1697,39 @@ '../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', - '../src/arm64/macro-assembler-arm64-inl.h', '../src/arm64/simulator-arm64.cc', '../src/arm64/simulator-arm64.h', '../src/arm64/simulator-logic-arm64.cc', '../src/arm64/utils-arm64.cc', '../src/arm64/utils-arm64.h', - '../src/arm64/eh-frame-arm64.cc', '../src/compiler/arm64/code-generator-arm64.cc', '../src/compiler/arm64/instruction-codes-arm64.h', '../src/compiler/arm64/instruction-scheduler-arm64.cc', '../src/compiler/arm64/instruction-selector-arm64.cc', '../src/compiler/arm64/unwinding-info-writer-arm64.cc', - '../src/compiler/arm64/unwinding-info-writer-arm64.h', - '../src/debug/arm64/debug-arm64.cc', - '../src/regexp/arm64/regexp-macro-assembler-arm64.cc', - '../src/regexp/arm64/regexp-macro-assembler-arm64.h', - '../src/wasm/baseline/arm64/liftoff-assembler-arm64.h', - ], - }], - ['v8_target_arch=="ia32"', { - 'sources': [ - '../src/ia32/assembler-ia32-inl.h', - '../src/ia32/assembler-ia32.cc', - '../src/ia32/assembler-ia32.h', - '../src/ia32/code-stubs-ia32.cc', - '../src/ia32/codegen-ia32.cc', - '../src/ia32/cpu-ia32.cc', - '../src/ia32/deoptimizer-ia32.cc', - '../src/ia32/disasm-ia32.cc', - '../src/ia32/frame-constants-ia32.cc', - '../src/ia32/frame-constants-ia32.h', - '../src/ia32/interface-descriptors-ia32.cc', - '../src/ia32/macro-assembler-ia32.cc', - '../src/ia32/macro-assembler-ia32.h', - '../src/ia32/simulator-ia32.cc', - '../src/ia32/simulator-ia32.h', - '../src/ia32/sse-instr.h', - '../src/compiler/ia32/code-generator-ia32.cc', - '../src/compiler/ia32/instruction-codes-ia32.h', - '../src/compiler/ia32/instruction-scheduler-ia32.cc', - '../src/compiler/ia32/instruction-selector-ia32.cc', - '../src/debug/ia32/debug-ia32.cc', - '../src/regexp/ia32/regexp-macro-assembler-ia32.cc', - '../src/regexp/ia32/regexp-macro-assembler-ia32.h', - '../src/wasm/baseline/ia32/liftoff-assembler-ia32.h', + '../src/compiler/arm64/unwinding-info-writer-arm64.h', + '../src/debug/arm64/debug-arm64.cc', + '../src/regexp/arm64/regexp-macro-assembler-arm64.cc', + '../src/regexp/arm64/regexp-macro-assembler-arm64.h', + '../src/wasm/baseline/arm64/liftoff-assembler-arm64.h', ], }], ['v8_target_arch=="mips" or v8_target_arch=="mipsel"', { 'sources': [ + '../src/compiler/mips/code-generator-mips.cc', + '../src/compiler/mips/instruction-codes-mips.h', + '../src/compiler/mips/instruction-scheduler-mips.cc', + '../src/compiler/mips/instruction-selector-mips.cc', + '../src/debug/mips/debug-mips.cc', + '../src/mips/assembler-mips-inl.h', '../src/mips/assembler-mips.cc', '../src/mips/assembler-mips.h', - '../src/mips/assembler-mips-inl.h', - '../src/mips/codegen-mips.cc', '../src/mips/code-stubs-mips.cc', '../src/mips/code-stubs-mips.h', + '../src/mips/codegen-mips.cc', '../src/mips/constants-mips.cc', '../src/mips/constants-mips.h', '../src/mips/cpu-mips.cc', @@ -1696,11 +1742,6 @@ '../src/mips/macro-assembler-mips.h', '../src/mips/simulator-mips.cc', '../src/mips/simulator-mips.h', - '../src/compiler/mips/code-generator-mips.cc', - '../src/compiler/mips/instruction-codes-mips.h', - '../src/compiler/mips/instruction-scheduler-mips.cc', - '../src/compiler/mips/instruction-selector-mips.cc', - '../src/debug/mips/debug-mips.cc', '../src/regexp/mips/regexp-macro-assembler-mips.cc', '../src/regexp/mips/regexp-macro-assembler-mips.h', '../src/wasm/baseline/mips/liftoff-assembler-mips.h', @@ -1708,12 +1749,17 @@ }], ['v8_target_arch=="mips64" or v8_target_arch=="mips64el"', { 'sources': [ + '../src/compiler/mips64/code-generator-mips64.cc', + '../src/compiler/mips64/instruction-codes-mips64.h', + '../src/compiler/mips64/instruction-scheduler-mips64.cc', + '../src/compiler/mips64/instruction-selector-mips64.cc', + '../src/debug/mips64/debug-mips64.cc', + '../src/mips64/assembler-mips64-inl.h', '../src/mips64/assembler-mips64.cc', '../src/mips64/assembler-mips64.h', - '../src/mips64/assembler-mips64-inl.h', - '../src/mips64/codegen-mips64.cc', '../src/mips64/code-stubs-mips64.cc', '../src/mips64/code-stubs-mips64.h', + '../src/mips64/codegen-mips64.cc', '../src/mips64/constants-mips64.cc', '../src/mips64/constants-mips64.h', '../src/mips64/cpu-mips64.cc', @@ -1726,59 +1772,11 @@ '../src/mips64/macro-assembler-mips64.h', '../src/mips64/simulator-mips64.cc', '../src/mips64/simulator-mips64.h', - '../src/compiler/mips64/code-generator-mips64.cc', - '../src/compiler/mips64/instruction-codes-mips64.h', - '../src/compiler/mips64/instruction-scheduler-mips64.cc', - '../src/compiler/mips64/instruction-selector-mips64.cc', - '../src/debug/mips64/debug-mips64.cc', '../src/regexp/mips64/regexp-macro-assembler-mips64.cc', '../src/regexp/mips64/regexp-macro-assembler-mips64.h', '../src/wasm/baseline/mips64/liftoff-assembler-mips64.h', ], }], - ['v8_target_arch=="x64"', { - 'sources': [ - '../src/compiler/x64/code-generator-x64.cc', - '../src/compiler/x64/instruction-codes-x64.h', - '../src/compiler/x64/instruction-scheduler-x64.cc', - '../src/compiler/x64/instruction-selector-x64.cc', - '../src/compiler/x64/unwinding-info-writer-x64.cc', - '../src/compiler/x64/unwinding-info-writer-x64.h', - '../src/x64/assembler-x64-inl.h', - '../src/x64/assembler-x64.cc', - '../src/x64/assembler-x64.h', - '../src/x64/code-stubs-x64.cc', - '../src/x64/codegen-x64.cc', - '../src/x64/cpu-x64.cc', - '../src/x64/deoptimizer-x64.cc', - '../src/x64/disasm-x64.cc', - '../src/x64/eh-frame-x64.cc', - '../src/x64/frame-constants-x64.cc', - '../src/x64/frame-constants-x64.h', - '../src/x64/interface-descriptors-x64.cc', - '../src/x64/macro-assembler-x64.cc', - '../src/x64/macro-assembler-x64.h', - '../src/x64/simulator-x64.cc', - '../src/x64/simulator-x64.h', - '../src/x64/sse-instr.h', - '../src/debug/x64/debug-x64.cc', - '../src/regexp/x64/regexp-macro-assembler-x64.cc', - '../src/regexp/x64/regexp-macro-assembler-x64.h', - '../src/third_party/valgrind/valgrind.h', - '../src/wasm/baseline/x64/liftoff-assembler-x64.h', - ], - }], - ['v8_target_arch=="x64" and OS=="linux"', { - 'sources': [ - '../src/trap-handler/handler-inside-linux.cc', - '../src/trap-handler/handler-outside-linux.cc', - ], - }], - ['v8_target_arch=="x64" and OS=="win"', { - 'sources': [ - '../src/trap-handler/handler-outside-win.cc', - ], - }], ['v8_target_arch=="ppc" or v8_target_arch=="ppc64"', { 'sources': [ '../src/compiler/ppc/code-generator-ppc.cc', @@ -1818,12 +1816,12 @@ '../src/debug/s390/debug-s390.cc', '../src/regexp/s390/regexp-macro-assembler-s390.cc', '../src/regexp/s390/regexp-macro-assembler-s390.h', + '../src/s390/assembler-s390-inl.h', '../src/s390/assembler-s390.cc', '../src/s390/assembler-s390.h', - '../src/s390/assembler-s390-inl.h', - '../src/s390/codegen-s390.cc', '../src/s390/code-stubs-s390.cc', '../src/s390/code-stubs-s390.h', + '../src/s390/codegen-s390.cc', '../src/s390/constants-s390.cc', '../src/s390/constants-s390.h', '../src/s390/cpu-s390.cc', @@ -1943,10 +1941,10 @@ '../src/base/compiler-specific.h', '../src/base/cpu.cc', '../src/base/cpu.h', - '../src/base/division-by-constant.cc', - '../src/base/division-by-constant.h', '../src/base/debug/stack_trace.cc', '../src/base/debug/stack_trace.h', + '../src/base/division-by-constant.cc', + '../src/base/division-by-constant.h', '../src/base/export-template.h', '../src/base/file-utils.cc', '../src/base/file-utils.h', @@ -1955,8 +1953,8 @@ '../src/base/free_deleter.h', '../src/base/functional.cc', '../src/base/functional.h', - '../src/base/hashmap.h', '../src/base/hashmap-entry.h', + '../src/base/hashmap.h', '../src/base/ieee754.cc', '../src/base/ieee754.h', '../src/base/iterator.h', @@ -1969,16 +1967,16 @@ '../src/base/optional.h', '../src/base/page-allocator.cc', '../src/base/page-allocator.h', - '../src/base/platform/elapsed-timer.h', - '../src/base/platform/time.cc', - '../src/base/platform/time.h', '../src/base/platform/condition-variable.cc', '../src/base/platform/condition-variable.h', + '../src/base/platform/elapsed-timer.h', '../src/base/platform/mutex.cc', '../src/base/platform/mutex.h', '../src/base/platform/platform.h', '../src/base/platform/semaphore.cc', '../src/base/platform/semaphore.h', + '../src/base/platform/time.cc', + '../src/base/platform/time.h', '../src/base/ring-buffer.h', '../src/base/safe_conversions.h', '../src/base/safe_conversions_impl.h', @@ -2023,20 +2021,28 @@ 'sources': [ '../src/base/debug/stack_trace_posix.cc', '../src/base/platform/platform-linux.cc', - '../src/base/platform/platform-posix.h', '../src/base/platform/platform-posix.cc', - '../src/base/platform/platform-posix-time.h', + '../src/base/platform/platform-posix.h', '../src/base/platform/platform-posix-time.cc', + '../src/base/platform/platform-posix-time.h', ], } ], + ['OS=="aix"', { + 'sources': [ + '../src/base/debug/stack_trace_posix.cc', + '../src/base/platform/platform-aix.cc', + '../src/base/platform/platform-posix.cc' + '../src/base/platform/platform-posix.h', + ]}, + ], ['OS=="android"', { 'sources': [ '../src/base/debug/stack_trace_android.cc', - '../src/base/platform/platform-posix.h', '../src/base/platform/platform-posix.cc', - '../src/base/platform/platform-posix-time.h', + '../src/base/platform/platform-posix.h', '../src/base/platform/platform-posix-time.cc', + '../src/base/platform/platform-posix-time.h', ], 'link_settings': { 'target_conditions': [ @@ -2074,6 +2080,71 @@ ], }, ], + ['OS=="fuchsia"', { + 'sources': [ + '../src/base/debug/stack_trace_fuchsia.cc', + '../src/base/platform/platform-fuchsia.cc', + ]}, + ], + ['OS=="mac"', { + 'sources': [ + '../src/base/debug/stack_trace_posix.cc', + '../src/base/platform/platform-macos.cc', + '../src/base/platform/platform-posix.cc', + '../src/base/platform/platform-posix.h', + '../src/base/platform/platform-posix-time.cc', + '../src/base/platform/platform-posix-time.h', + ]}, + ], + ['OS=="win"', { + 'defines': [ + '_CRT_RAND_S' # for rand_s() + ], + 'variables': { + 'gyp_generators': ' Date: Thu, 2 Aug 2018 23:10:35 +0200 Subject: [PATCH 2/2] fixup aix --- deps/v8/gypfiles/v8.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index 29dd25d164025a..742a597acd4f73 100644 --- a/deps/v8/gypfiles/v8.gyp +++ b/deps/v8/gypfiles/v8.gyp @@ -2032,7 +2032,7 @@ 'sources': [ '../src/base/debug/stack_trace_posix.cc', '../src/base/platform/platform-aix.cc', - '../src/base/platform/platform-posix.cc' + '../src/base/platform/platform-posix.cc', '../src/base/platform/platform-posix.h', ]}, ],