summaryrefslogtreecommitdiff
path: root/deps/v8/gni
diff options
context:
space:
mode:
authorMichaƫl Zasso <targos@protonmail.com>2018-05-31 11:11:57 +0200
committerMyles Borins <mylesborins@google.com>2018-06-01 09:58:27 +0200
commit352a525eb984b8fa2d6f0f6fd68395e6a080bba4 (patch)
treea105ae93f8fd8f533cce19a429f1b6e95d6e11ca /deps/v8/gni
parentfaf449ca0490f5371dc6cbbc94a87eb697b00fcc (diff)
downloadandroid-node-v8-352a525eb984b8fa2d6f0f6fd68395e6a080bba4.tar.gz
android-node-v8-352a525eb984b8fa2d6f0f6fd68395e6a080bba4.tar.bz2
android-node-v8-352a525eb984b8fa2d6f0f6fd68395e6a080bba4.zip
deps: update V8 to 6.7.288.43
PR-URL: https://github.com/nodejs/node/pull/19989 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matheus Marchini <matheus@sthima.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Myles Borins <myles.borins@gmail.com>
Diffstat (limited to 'deps/v8/gni')
-rw-r--r--deps/v8/gni/isolate.gni196
-rw-r--r--deps/v8/gni/msvs_dependencies.isolate97
-rw-r--r--deps/v8/gni/v8.gni13
3 files changed, 13 insertions, 293 deletions
diff --git a/deps/v8/gni/isolate.gni b/deps/v8/gni/isolate.gni
deleted file mode 100644
index 6ad25c2774..0000000000
--- a/deps/v8/gni/isolate.gni
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 2016 the V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/sanitizers/sanitizers.gni")
-import("//third_party/icu/config.gni")
-import("v8.gni")
-
-declare_args() {
- # Sets the test isolation mode (noop|prepare|check).
- v8_test_isolation_mode = "noop"
-}
-
-template("v8_isolate_run") {
- forward_variables_from(invoker,
- "*",
- [
- "deps",
- "isolate",
- ])
-
- # Remember target name as within the action scope the target name will be
- # different.
- name = target_name
-
- assert(defined(invoker.deps))
- assert(defined(invoker.isolate))
-
- if (name != "" && v8_test_isolation_mode != "noop") {
- action(name + "_run") {
- testonly = true
-
- deps = invoker.deps
-
- script = "//tools/isolate_driver.py"
-
- sources = [
- invoker.isolate,
- ]
-
- inputs = [
- # Files that are known to be involved in this step.
- "//tools/swarming_client/isolate.py",
- "//tools/swarming_client/run_isolated.py",
- ]
-
- if (v8_test_isolation_mode == "prepare") {
- outputs = [
- "$root_out_dir/$name.isolated.gen.json",
- ]
- } else if (v8_test_isolation_mode == "check") {
- outputs = [
- "$root_out_dir/$name.isolated",
- "$root_out_dir/$name.isolated.state",
- ]
- }
-
- # Translate gn to gyp variables.
- if (v8_code_coverage) {
- coverage = "1"
- } else {
- coverage = "0"
- }
- if (is_asan) {
- asan = "1"
- } else {
- asan = "0"
- }
- if (is_msan) {
- msan = "1"
- } else {
- msan = "0"
- }
- if (is_tsan) {
- tsan = "1"
- } else {
- tsan = "0"
- }
- if (is_cfi) {
- cfi_vptr = "1"
- } else {
- cfi_vptr = "0"
- }
- if (target_cpu == "x86") {
- target_arch = "ia32"
- } else {
- target_arch = target_cpu
- }
- if (is_debug) {
- configuration_name = "Debug"
- } else {
- configuration_name = "Release"
- }
- if (is_component_build) {
- component = "shared_library"
- } else {
- component = "static_library"
- }
- if (icu_use_data_file) {
- icu_use_data_file_flag = "1"
- } else {
- icu_use_data_file_flag = "0"
- }
- if (v8_use_external_startup_data) {
- use_external_startup_data = "1"
- } else {
- use_external_startup_data = "0"
- }
- if (is_ubsan_vptr) {
- ubsan_vptr = "1"
- } else {
- ubsan_vptr = "0"
- }
- if (v8_use_snapshot) {
- use_snapshot = "true"
- } else {
- use_snapshot = "false"
- }
- if (v8_has_valgrind) {
- has_valgrind = "1"
- } else {
- has_valgrind = "0"
- }
- if (v8_gcmole) {
- gcmole = "1"
- } else {
- gcmole = "0"
- }
-
- # Note, all paths will be rebased in isolate_driver.py to be relative to
- # the isolate file.
- args = [
- v8_test_isolation_mode,
- "--isolated",
- rebase_path("$root_out_dir/$name.isolated", root_build_dir),
- "--isolate",
- rebase_path(invoker.isolate, root_build_dir),
-
- # Path variables are used to replace file paths when loading a .isolate
- # file
- "--path-variable",
- "DEPTH",
- rebase_path("//", root_build_dir),
- "--path-variable",
- "PRODUCT_DIR",
- rebase_path(root_out_dir, root_build_dir),
-
- # TODO(machenbach): Set variables for remaining features.
- "--config-variable",
- "CONFIGURATION_NAME=$configuration_name",
- "--config-variable",
- "OS=$target_os",
- "--config-variable",
- "asan=$asan",
- "--config-variable",
- "cfi_vptr=$cfi_vptr",
- "--config-variable",
- "gcmole=$gcmole",
- "--config-variable",
- "has_valgrind=$has_valgrind",
- "--config-variable",
- "icu_use_data_file_flag=$icu_use_data_file_flag",
- "--config-variable",
- "msan=$msan",
- "--config-variable",
- "tsan=$tsan",
- "--config-variable",
- "coverage=$coverage",
- "--config-variable",
- "sanitizer_coverage=$sanitizer_coverage_flags",
- "--config-variable",
- "component=$component",
- "--config-variable",
- "target_arch=$target_arch",
- "--config-variable",
- "ubsan_vptr=$ubsan_vptr",
- "--config-variable",
- "v8_use_external_startup_data=$use_external_startup_data",
- "--config-variable",
- "v8_use_snapshot=$use_snapshot",
- ]
-
- if (is_win) {
- args += [
- "--config-variable",
- "msvs_version=2017",
- ]
- } else {
- args += [
- "--config-variable",
- "msvs_version=0",
- ]
- }
- }
- }
-}
diff --git a/deps/v8/gni/msvs_dependencies.isolate b/deps/v8/gni/msvs_dependencies.isolate
deleted file mode 100644
index 2859126659..0000000000
--- a/deps/v8/gni/msvs_dependencies.isolate
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# TODO(machenbach): Remove this when crbug.com/669910 is resolved.
-{
- 'conditions': [
- # Copy the VS runtime DLLs into the isolate so that they
- # don't have to be preinstalled on the target machine.
- #
- # VS2013 runtimes
- ['OS=="win" and msvs_version==2013 and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/msvcp120d.dll',
- '<(PRODUCT_DIR)/msvcr120d.dll',
- ],
- },
- }],
- ['OS=="win" and msvs_version==2013 and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/msvcp120.dll',
- '<(PRODUCT_DIR)/msvcr120.dll',
- ],
- },
- }],
- # VS2015/2017 runtimes
- ['OS=="win" and (msvs_version==2015 or msvs_version==2017) and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/msvcp140d.dll',
- '<(PRODUCT_DIR)/vccorlib140d.dll',
- '<(PRODUCT_DIR)/vcruntime140d.dll',
- '<(PRODUCT_DIR)/ucrtbased.dll',
- ],
- },
- }],
- ['OS=="win" and (msvs_version==2015 or msvs_version==2017) and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/msvcp140.dll',
- '<(PRODUCT_DIR)/vccorlib140.dll',
- '<(PRODUCT_DIR)/vcruntime140.dll',
- '<(PRODUCT_DIR)/ucrtbase.dll',
- ],
- },
- }],
- ['OS=="win" and (msvs_version==2015 or msvs_version==2017) and component=="shared_library"', {
- # Windows 10 Universal C Runtime binaries.
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/api-ms-win-core-console-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-datetime-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-debug-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-errorhandling-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-file-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-file-l1-2-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-file-l2-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-handle-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-heap-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-interlocked-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-libraryloader-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-localization-l1-2-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-memory-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-namedpipe-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-processenvironment-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-processthreads-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-processthreads-l1-1-1.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-profile-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-rtlsupport-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-string-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-synch-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-synch-l1-2-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-sysinfo-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-timezone-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-core-util-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-conio-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-convert-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-environment-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-filesystem-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-heap-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-locale-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-math-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-multibyte-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-private-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-process-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-runtime-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-stdio-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-string-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-time-l1-1-0.dll',
- '<(PRODUCT_DIR)/api-ms-win-crt-utility-l1-1-0.dll',
- ],
- },
- }],
- ],
-}
diff --git a/deps/v8/gni/v8.gni b/deps/v8/gni/v8.gni
index 16a124dce8..211f15aab9 100644
--- a/deps/v8/gni/v8.gni
+++ b/deps/v8/gni/v8.gni
@@ -37,6 +37,9 @@ declare_args() {
# https://803591
v8_use_snapshot = !(is_win && host_os != "win" && target_cpu == "x64")
+ # Enable several snapshots side-by-side (e.g. default and for trusted code).
+ v8_use_multi_snapshots = ""
+
# Use external files for startup data blobs:
# the JS builtins sources and the start snapshot.
v8_use_external_startup_data = ""
@@ -58,6 +61,11 @@ if (v8_use_external_startup_data == "") {
v8_use_external_startup_data = v8_use_snapshot && !is_ios
}
+if (v8_use_multi_snapshots == "") {
+ v8_use_multi_snapshots =
+ v8_use_external_startup_data && !build_with_chromium && !use_jumbo_build
+}
+
if (v8_enable_backtrace == "") {
v8_enable_backtrace = is_debug && !v8_optimized_debug
}
@@ -113,6 +121,10 @@ if (target_cpu == "mipsel" || target_cpu == "mips64el" ||
v8_add_configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
+if (!build_with_chromium && is_clang) {
+ v8_remove_configs += [ "//build/config/clang:find_bad_constructs" ]
+}
+
# All templates should be kept in sync.
template("v8_source_set") {
if (defined(invoker.split_count) && invoker.split_count > 1 &&
@@ -192,6 +204,7 @@ template("v8_static_library") {
forward_variables_from(invoker, "*", [ "configs" ])
configs += invoker.configs
configs -= v8_remove_configs
+ configs -= [ "//build/config/compiler:thin_archive" ]
configs += v8_add_configs
}
}