Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: update V8 to 5.4 #8317

Merged
merged 9 commits into from
Sep 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ $(NODE_G_EXE): config.gypi out/Makefile
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
ln -fs out/Debug/$(NODE_EXE) $@

out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
deps/v8/gypfiles/features.gypi deps/v8/src/v8.gyp node.gyp \
config.gypi
$(PYTHON) tools/gyp_node.py -f make

config.gypi: configure
Expand Down Expand Up @@ -105,7 +108,6 @@ distclean:
-rm -rf deps/icu4c*.tgz deps/icu4c*.zip deps/icu-tmp
-rm -f $(BINARYTAR).* $(TARBALL).*
-rm -rf deps/v8/testing/gmock
-rm -rf deps/v8/testing/gtest

check: test

Expand Down
6 changes: 5 additions & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
# Don't bake anything extra into the snapshot.
'v8_use_external_startup_data%': 0,

# Don't use ICU data file (icudtl.dat) from V8, we use our own.
'icu_use_data_file_flag%': 0,

'conditions': [
['OS == "win"', {
'os_posix': 0,
Expand All @@ -44,7 +47,7 @@
'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
}, {
'OBJ_DIR': '<(PRODUCT_DIR)/obj.target',
'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.a',
'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
}],
['openssl_fips != ""', {
'OPENSSL_PRODUCT': 'libcrypto.a',
Expand Down Expand Up @@ -382,6 +385,7 @@
'xcode_settings': {
'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', # -std=gnu++0x
'CLANG_CXX_LIBRARY': 'libc++',
},
}],
],
Expand Down
2 changes: 2 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,8 @@ def configure_node(o):
want_snapshots = not options.without_snapshot
o['variables']['want_separate_host_toolset'] = int(
cross_compiling and want_snapshots)
o['variables']['want_separate_host_toolset_mkpeephole'] = int(
cross_compiling)

if target_arch == 'arm':
configure_arm(o)
Expand Down
27 changes: 21 additions & 6 deletions deps/v8/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,13 @@ gcsuspects
shell
shell_g
/_*
/build/Debug
/build/gyp
/build/ipch
/build/Release
/build/win_toolchain.json
/build
/gypfiles/win_toolchain.json
/buildtools
/hydrogen.cfg
/obj
/out
/out.gn
/perf.data
/perf.data.old
/test/benchmarks/data
Expand All @@ -59,20 +57,35 @@ shell_g
/test/simdjs/data
/test/test262/data
/test/test262/data.tar
/test/test262/harness
/testing/gmock
/testing/gtest
/testing/gtest/*
!/testing/gtest/include
/testing/gtest/include/*
!/testing/gtest/include/gtest
/testing/gtest/include/gtest/*
!/testing/gtest/include/gtest/gtest_prod.h
/third_party
/third_party/android_tools
/third_party/cygwin
/third_party/icu
/third_party/instrumented_libraries
/third_party/inspector_protocol
/third_party/jinga2
/third_party/llvm
/third_party/llvm-build
/third_party/markupsafe
/third_party/WebKit
/tools/clang
/tools/gcmole/gcmole-tools
/tools/gcmole/gcmole-tools.tar.gz
/tools/gyp
/tools/jsfunfuzz/jsfunfuzz
/tools/jsfunfuzz/jsfunfuzz.tar.gz
/tools/luci-go/linux64/isolate
/tools/luci-go/mac64/isolate
/tools/luci-go/win64/isolate.exe
/tools/mb
/tools/oom_dump/oom_dump
/tools/oom_dump/oom_dump.o
/tools/swarming_client
Expand All @@ -86,7 +99,9 @@ GTAGS
GRTAGS
GSYMS
GPATH
tags
gtags.files
turbo*.cfg
turbo*.dot
turbo*.json
v8.ignition_dispatches_table.json
51 changes: 51 additions & 0 deletions deps/v8/.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# This file is used by the GN meta build system to find the root of the source
# tree and to set startup options. For documentation on the values set in this
# file, run "gn help dotfile" at the command line.

# The location of the build configuration file.
buildconfig = "//build/config/BUILDCONFIG.gn"

# The secondary source root is a parallel directory tree where
# GN build files are placed when they can not be placed directly
# in the source tree, e.g. for third party source trees.
secondary_source = "//build/secondary/"

# These are the targets to check headers for by default. The files in targets
# matching these patterns (see "gn help label_pattern" for format) will have
# their includes checked for proper dependencies when you run either
# "gn check" or "gn gen --check".
check_targets = [
]

# These are the list of GN files that run exec_script. This whitelist exists
# to force additional review for new uses of exec_script, which is strongly
# discouraged except for gypi_to_gn calls.
exec_script_whitelist = [
"//build/config/android/BUILD.gn",
"//build/config/android/config.gni",
"//build/config/android/internal_rules.gni",
"//build/config/android/rules.gni",
"//build/config/BUILD.gn",
"//build/config/compiler/BUILD.gn",
"//build/config/gcc/gcc_version.gni",
"//build/config/ios/ios_sdk.gni",
"//build/config/linux/atk/BUILD.gn",
"//build/config/linux/BUILD.gn",
"//build/config/linux/pkg_config.gni",
"//build/config/mac/mac_sdk.gni",
"//build/config/posix/BUILD.gn",
"//build/config/sysroot.gni",
"//build/config/win/BUILD.gn",
"//build/config/win/visual_studio_version.gni",
"//build/gn_helpers.py",
"//build/gypi_to_gn.py",
"//build/toolchain/concurrent_links.gni",
"//build/toolchain/gcc_toolchain.gni",
"//build/toolchain/mac/BUILD.gn",
"//build/toolchain/win/BUILD.gn",
"//build/util/branding.gni",
"//build/util/version.gni",
"//test/cctest/BUILD.gn",
"//test/test262/BUILD.gn",
"//test/unittests/BUILD.gn",
]
8 changes: 7 additions & 1 deletion deps/v8/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Alexis Campailla <[email protected]>
Andreas Anyuru <[email protected]>
Andrew Paprocki <[email protected]>
Andrei Kashcha <[email protected]>
Anna Henningsen <[email protected]>
Bangfu Tao <[email protected]>
Ben Noordhuis <[email protected]>
Benjamin Tan <[email protected]>
Expand All @@ -50,7 +51,9 @@ Craig Schlenter <[email protected]>
Chris Nardi <[email protected]>
Christopher A. Taylor <[email protected]>
Daniel Andersson <[email protected]>
Daniel Bevenius <[email protected]>
Daniel James <[email protected]>
Deon Dior <[email protected]>
Douglas Crosher <[email protected]>
Dusan Milosavljevic <[email protected]>
Erich Ocean <[email protected]>
Expand All @@ -62,6 +65,7 @@ Franziska Hinkelmann <[email protected]>
Geoffrey Garside <[email protected]>
Han Choongwoo <[email protected]>
Hirofumi Mako <[email protected]>
Honggyu Kim <[email protected]>
Ioseb Dzmanashvili <[email protected]>
Isiah Meadows <[email protected]>
Jan de Mooij <[email protected]>
Expand All @@ -85,11 +89,13 @@ Matthew Sporleder <[email protected]>
Maxim Mossienko <[email protected]>
Michael Lutz <[email protected]>
Michael Smith <[email protected]>
Michaël Zasso <[email protected]>
Mike Gilbert <[email protected]>
Mike Pennisi <[email protected]>
Milton Chiang <[email protected]>
Myeong-bo Shim <[email protected]>
Nicolas Antonius Ernst Leopold Maria Kaiser <[email protected]>
Oleksandr Chekhovskyi <[email protected]>
Paolo Giarrusso <[email protected]>
Patrick Gansterer <[email protected]>
Peter Varga <[email protected]>
Expand All @@ -113,4 +119,4 @@ Vladimir Shutoff <[email protected]>
Yu Yin <[email protected]>
Zac Hansen <[email protected]>
Zhongping Wang <[email protected]>
柳荣一 <[email protected]>
柳荣一 <[email protected]>
Loading