FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Revert "deps: update V8 to 6.2.414.33" · nodejs/node@6645126 · GitHub

/ node Public

Commit 6645126

Browse files
targos
committed
Revert "deps: update V8 to 6.2.414.33"
This reverts commit d4033c1. The commit broke cross-compilation and it was missed. PR-URL: #16513 Refs: #16412 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent 9702ac5 commit 6645126

10 files changed

Lines changed: 17 additions & 98 deletions

File tree

‎deps/v8/BUILD.gn‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,7 @@ action("v8_dump_build_config") {
827827
is_gcov_coverage = v8_code_coverage && !is_clang
828828
args = [
829829
rebase_path("$root_out_dir/v8_build_config.json", root_build_dir),
830+
"current_cpu=\"$current_cpu\"",
830831
"dcheck_always_on=$dcheck_always_on",
831832
"is_asan=$is_asan",
832833
"is_cfi=$is_cfi",
@@ -837,6 +838,7 @@ action("v8_dump_build_config") {
837838
"is_tsan=$is_tsan",
838839
"is_ubsan_vptr=$is_ubsan_vptr",
839840
"target_cpu=\"$target_cpu\"",
841+
"v8_current_cpu=\"$v8_current_cpu\"",
840842
"v8_enable_i18n_support=$v8_enable_i18n_support",
841843
"v8_target_cpu=\"$v8_target_cpu\"",
842844
"v8_use_snapshot=$v8_use_snapshot",

‎deps/v8/gni/isolate.gni‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ template("v8_isolate_run") {
156156
"--config-variable",
157157
"icu_use_data_file_flag=$icu_use_data_file_flag",
158158
"--config-variable",
159+
"is_gn=1",
160+
"--config-variable",
159161
"msan=$msan",
160162
"--config-variable",
161163
"tsan=$tsan",

‎deps/v8/gypfiles/isolate.gypi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
'--config-variable', 'gcmole=<(gcmole)',
7575
'--config-variable', 'has_valgrind=<(has_valgrind)',
7676
'--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
77+
'--config-variable', 'is_gn=0',
7778
'--config-variable', 'msan=<(msan)',
7879
'--config-variable', 'tsan=<(tsan)',
7980
'--config-variable', 'coverage=<(coverage)',

‎deps/v8/gypfiles/toolchain.gypi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
'msvs_use_common_release': 0,
3333
'clang%': 0,
3434
'asan%': 0,
35-
'cfi_vptr%': 0,
3635
'lsan%': 0,
3736
'msan%': 0,
3837
'tsan%': 0,

‎deps/v8/include/v8-version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define V8_MAJOR_VERSION 6
1212
#define V8_MINOR_VERSION 2
1313
#define V8_BUILD_NUMBER 414
14-
#define V8_PATCH_LEVEL 33
14+
#define V8_PATCH_LEVEL 32
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

‎deps/v8/src/v8.gyp‎

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
{
4343
'target_name': 'v8',
4444
'dependencies_traverse': 1,
45-
'dependencies': ['v8_maybe_snapshot', 'v8_dump_build_config'],
45+
'dependencies': ['v8_maybe_snapshot'],
4646
'conditions': [
4747
['want_separate_host_toolset==1', {
4848
'toolsets': ['host', 'target'],
@@ -2499,49 +2499,5 @@
24992499
}],
25002500
],
25012501
},
2502-
{
2503-
'target_name': 'v8_dump_build_config',
2504-
'type': 'none',
2505-
'variables': {
2506-
},
2507-
'conditions': [
2508-
[ 'want_separate_host_toolset==1', {
2509-
'toolsets': ['host'],
2510-
}, {
2511-
'toolsets': ['target'],
2512-
}]
2513-
],
2514-
'actions': [
2515-
{
2516-
'action_name': 'v8_dump_build_config',
2517-
'inputs': [
2518-
'../tools/testrunner/utils/dump_build_config_gyp.py',
2519-
],
2520-
'outputs': [
2521-
'<(PRODUCT_DIR)/v8_build_config.json',
2522-
],
2523-
'action': [
2524-
'python',
2525-
'../tools/testrunner/utils/dump_build_config_gyp.py',
2526-
'<(PRODUCT_DIR)/v8_build_config.json',
2527-
'dcheck_always_on=<(dcheck_always_on)',
2528-
'is_asan=<(asan)',
2529-
'is_cfi=<(cfi_vptr)',
2530-
'is_component_build="<(component)"',
2531-
'is_debug="<(CONFIGURATION_NAME)"',
2532-
# Not available in gyp.
2533-
'is_gcov_coverage=0',
2534-
'is_msan=<(msan)',
2535-
'is_tsan=<(tsan)',
2536-
# Not available in gyp.
2537-
'is_ubsan_vptr=0',
2538-
'target_cpu="<(target_arch)"',
2539-
'v8_enable_i18n_support=<(v8_enable_i18n_support)',
2540-
'v8_target_cpu="<(v8_target_arch)"',
2541-
'v8_use_snapshot=<(v8_use_snapshot)',
2542-
],
2543-
},
2544-
],
2545-
},
25462502
],
25472503
}

‎deps/v8/tools/foozzie/v8_foozzie.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def infer_arch(d8):
127127
executable.
128128
"""
129129
with open(os.path.join(os.path.dirname(d8), 'v8_build_config.json')) as f:
130-
arch = json.load(f)['v8_target_cpu']
130+
arch = json.load(f)['v8_current_cpu']
131131
return 'ia32' if arch == 'x86' else arch
132132

133133

‎deps/v8/tools/testrunner/testrunner.isolate‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
'../run-tests.py',
88
],
99
'files': [
10-
'<(PRODUCT_DIR)/v8_build_config.json',
1110
'../run-tests.py',
1211
'./'
1312
],
@@ -21,5 +20,12 @@
2120
],
2221
},
2322
}],
23+
['is_gn==1', {
24+
'variables': {
25+
'files': [
26+
'<(PRODUCT_DIR)/v8_build_config.json',
27+
],
28+
},
29+
}],
2430
],
2531
}

‎deps/v8/tools/testrunner/utils/dump_build_config.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
import os
1616
import sys
1717

18-
assert len(sys.argv) > 2
18+
assert len(sys.argv) > 1
1919

2020
def as_json(kv):
2121
assert '=' in kv
2222
k, v = kv.split('=', 1)
2323
return k, json.loads(v)
2424

2525
with open(sys.argv[1], 'w') as f:
26-
json.dump(dict(map(as_json, sys.argv[2:])), f)
26+
json.dump(dict(as_json(kv) for kv in sys.argv[2:]), f)

‎deps/v8/tools/testrunner/utils/dump_build_config_gyp.py‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL