From e5f795a8afb329f8bb14749a8f742b55d75623a1 Mon Sep 17 00:00:00 2001 From: Vasili Skurydzin Date: Mon, 15 Oct 2018 16:34:29 -0400 Subject: [PATCH] deps: cherry-pick d9e7832 from V8 upstream Original commit message: fix gn builds on aix Change-Id: I60aed7bf8207703fa6ceddb6165e173e68b5ff5f Reviewed-on: https://chromium-review.googlesource.com/1103533 Commit-Queue: Michael Achenbach Reviewed-by: Michael Achenbach Cr-Commit-Position: refs/heads/master@{#54386} PR-URL: https://github.com/nodejs/node/pull/23695 Reviewed-By: Michael Dawson Reviewed-By: Refael Ackermann Reviewed-By: Yang Guo Reviewed-By: Ujjwal Sharma --- common.gypi | 2 +- deps/v8/infra/mb/mb_config.pyl | 50 ++++++++++++++++++----------- deps/v8/third_party/antlr4/BUILD.gn | 3 ++ deps/v8/tools/mb/mb.py | 2 ++ 4 files changed, 38 insertions(+), 19 deletions(-) diff --git a/common.gypi b/common.gypi index da85dc58fd4825..0b05986cc22f61 100644 --- a/common.gypi +++ b/common.gypi @@ -33,7 +33,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.38', + 'v8_embedder_string': '-node.39', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/infra/mb/mb_config.pyl b/deps/v8/infra/mb/mb_config.pyl index 23b00624557606..f018eaa2c1cf51 100644 --- a/deps/v8/infra/mb/mb_config.pyl +++ b/deps/v8/infra/mb/mb_config.pyl @@ -27,18 +27,21 @@ 'mips64el.debug': 'default_debug_mips64el', 'mips64el.optdebug': 'default_optdebug_mips64el', 'mips64el.release': 'default_release_mips64el', - 'ppc.debug': 'default_debug_ppc', - 'ppc.optdebug': 'default_optdebug_ppc', - 'ppc.release': 'default_release_ppc', + 'ppc.debug.sim': 'default_debug_ppc_sim', + 'ppc.optdebug.sim': 'default_optdebug_ppc_sim', + 'ppc.release.sim': 'default_release_ppc_sim', 'ppc64.debug': 'default_debug_ppc64', + 'ppc64.debug.sim': 'default_debug_ppc64_sim', 'ppc64.optdebug': 'default_optdebug_ppc64', + 'ppc64.optdebug.sim': 'default_optdebug_ppc64_sim', 'ppc64.release': 'default_release_ppc64', - 's390.debug': 'default_debug_s390', - 's390.optdebug': 'default_optdebug_s390', - 's390.release': 'default_release_s390', - 's390x.debug': 'default_debug_s390x', - 's390x.optdebug': 'default_optdebug_s390x', - 's390x.release': 'default_release_s390x', + 'ppc64.release.sim': 'default_release_ppc64_sim', + 's390.debug.sim': 'default_debug_s390_sim', + 's390.optdebug.sim': 'default_optdebug_s390_sim', + 's390.release.sim': 'default_release_s390_sim', + 's390x.debug.sim': 'default_debug_s390x_sim', + 's390x.optdebug.sim': 'default_optdebug_s390x_sim', + 's390x.release.sim': 'default_release_s390x_sim', 'x64.debug': 'default_debug_x64', 'x64.optdebug': 'default_optdebug_x64', 'x64.release': 'default_release_x64', @@ -252,6 +255,7 @@ # To ease readability, config values are ordered by: # release/debug, arch type, other values alphabetically. + # TODO: create separate native configurations for ppc,s390[x]. 'configs': { # Developer default configs. 'default_debug_arm': [ @@ -284,29 +288,35 @@ 'debug', 'simulate_mips64el', 'v8_enable_slow_dchecks'], 'default_release_mips64el': [ 'release', 'simulate_mips64el'], - 'default_debug_ppc': [ + 'default_debug_ppc_sim': [ 'debug', 'simulate_ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'], - 'default_optdebug_ppc': [ + 'default_optdebug_ppc_sim': [ 'debug', 'simulate_ppc', 'v8_enable_slow_dchecks'], - 'default_release_ppc': [ + 'default_release_ppc_sim': [ 'release', 'simulate_ppc'], 'default_debug_ppc64': [ + 'debug', 'ppc64', 'gcc', 'v8_enable_slow_dchecks', 'v8_full_debug'], + 'default_debug_ppc64_sim': [ 'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks', 'v8_full_debug'], 'default_optdebug_ppc64': [ + 'debug', 'ppc64', 'gcc', 'v8_enable_slow_dchecks'], + 'default_optdebug_ppc64_sim': [ 'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks'], 'default_release_ppc64': [ + 'release', 'ppc64', 'gcc'], + 'default_release_ppc64_sim': [ 'release', 'simulate_ppc64'], - 'default_debug_s390': [ + 'default_debug_s390_sim': [ 'debug', 'simulate_s390', 'v8_enable_slow_dchecks', 'v8_full_debug'], - 'default_optdebug_s390': [ + 'default_optdebug_s390_sim': [ 'debug', 'simulate_s390', 'v8_enable_slow_dchecks'], - 'default_release_s390': [ + 'default_release_s390_sim': [ 'release', 'simulate_s390'], - 'default_debug_s390x': [ + 'default_debug_s390x_sim': [ 'debug', 'simulate_s390x', 'v8_enable_slow_dchecks', 'v8_full_debug'], - 'default_optdebug_s390x': [ + 'default_optdebug_s390x_sim': [ 'debug', 'simulate_s390x', 'v8_enable_slow_dchecks'], - 'default_release_s390x': [ + 'default_release_s390x_sim': [ 'release', 'simulate_s390x'], 'default_debug_x64': [ 'debug', 'x64', 'v8_enable_slow_dchecks', 'v8_full_debug'], @@ -823,5 +833,9 @@ 'x86': { 'gn_args': 'target_cpu="x86"', }, + + 'ppc64': { + 'gn_args': 'target_cpu="ppc64"', + }, }, } diff --git a/deps/v8/third_party/antlr4/BUILD.gn b/deps/v8/third_party/antlr4/BUILD.gn index bd58a1804d1558..65e2a78eb4c398 100644 --- a/deps/v8/third_party/antlr4/BUILD.gn +++ b/deps/v8/third_party/antlr4/BUILD.gn @@ -9,6 +9,9 @@ config("antlr-compatibility") { "-Wno-unused-but-set-variable", ] } + if (is_aix) { + cflags += [ "-fdollars-in-identifiers" ] + } } source_set("antlr4") { diff --git a/deps/v8/tools/mb/mb.py b/deps/v8/tools/mb/mb.py index b2ae0c763f6a15..189de8b6b7f2d7 100755 --- a/deps/v8/tools/mb/mb.py +++ b/deps/v8/tools/mb/mb.py @@ -832,6 +832,8 @@ def GNCmd(self, subcommand, path, *args): subdir, exe = 'linux64', 'gn' elif self.platform == 'darwin': subdir, exe = 'mac', 'gn' + elif self.platform == 'aix6': + subdir, exe = 'aix', 'gn' else: subdir, exe = 'win', 'gn.exe'