diff options
| author | Michaël Zasso <targos@protonmail.com> | 2017-10-18 15:03:02 -0700 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2017-10-18 17:01:41 -0700 |
| commit | 3d1b3df9486c0e7708065257f7311902f6b7b366 (patch) | |
| tree | cb051bdeaead11e06dcd97725783e0f113afb1bf /deps/v8/gypfiles | |
| parent | e2cddbb8ccdb7b3c4a40c8acc630f68703bc77b5 (diff) | |
| download | android-node-v8-3d1b3df9486c0e7708065257f7311902f6b7b366.tar.gz android-node-v8-3d1b3df9486c0e7708065257f7311902f6b7b366.tar.bz2 android-node-v8-3d1b3df9486c0e7708065257f7311902f6b7b366.zip | |
deps: update V8 to 6.2.414.32
PR-URL: https://github.com/nodejs/node/pull/15362
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/v8/gypfiles')
| -rw-r--r-- | deps/v8/gypfiles/features.gypi | 14 | ||||
| -rw-r--r-- | deps/v8/gypfiles/landmine_utils.py | 2 | ||||
| -rw-r--r-- | deps/v8/gypfiles/standalone.gypi | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/deps/v8/gypfiles/features.gypi b/deps/v8/gypfiles/features.gypi index a17dc556e6..55b250ddc1 100644 --- a/deps/v8/gypfiles/features.gypi +++ b/deps/v8/gypfiles/features.gypi @@ -29,8 +29,9 @@ { 'variables': { - # Allows the embedder to add a custom suffix to the version string. - 'v8_embedder_string%': '', + 'variables': { + 'v8_target_arch%': '<(target_arch)', + }, 'v8_enable_disassembler%': 0, @@ -79,12 +80,12 @@ # Temporary flag to allow embedders to update their microtasks scopes. 'v8_check_microtasks_scopes_consistency%': 'false', + + # Enable concurrent marking. + 'v8_enable_concurrent_marking%': 0, }, 'target_defaults': { 'conditions': [ - ['v8_embedder_string!=""', { - 'defines': ['V8_EMBEDDER_STRING="<(v8_embedder_string)"',], - }], ['v8_enable_disassembler==1', { 'defines': ['ENABLE_DISASSEMBLER',], }], @@ -130,6 +131,9 @@ ['v8_check_microtasks_scopes_consistency=="true"', { 'defines': ['V8_CHECK_MICROTASKS_SCOPES_CONSISTENCY',], }], + ['v8_enable_concurrent_marking==1', { + 'defines': ['V8_CONCURRENT_MARKING',], + }], ], # conditions 'configurations': { 'DebugBaseCommon': { diff --git a/deps/v8/gypfiles/landmine_utils.py b/deps/v8/gypfiles/landmine_utils.py index cb3499132a..8bdc2b648b 100644 --- a/deps/v8/gypfiles/landmine_utils.py +++ b/deps/v8/gypfiles/landmine_utils.py @@ -76,7 +76,7 @@ def distributor(): @memoize() def platform(): """ - Returns a string representing the platform this build is targetted for. + Returns a string representing the platform this build is targeted for. Possible values: 'win', 'mac', 'linux', 'ios', 'android' """ if 'OS' in gyp_defines(): diff --git a/deps/v8/gypfiles/standalone.gypi b/deps/v8/gypfiles/standalone.gypi index a30373be61..63930d8aef 100644 --- a/deps/v8/gypfiles/standalone.gypi +++ b/deps/v8/gypfiles/standalone.gypi @@ -754,7 +754,7 @@ '-Wno-unused-parameter', '-pthread', '-pedantic', - '-Wmissing-field-initializers', + '-Wno-missing-field-initializers', '-Wno-gnu-zero-variadic-macro-arguments', ], 'cflags_cc': [ |