Skip to content

Commit

Permalink
deps: cherry-pick abab9fb from V8 upstream
Browse files Browse the repository at this point in the history 
Original commit message:
  s390, ppc64: Enable v8gen.py on Linux s390, ppc64

  Change-Id: Ia05e949e1a823e30a45894c47f6f6df2e159befe
  Reviewed-on: https://chromium-review.googlesource.com/1135540
  Commit-Queue: Michael Achenbach <machenbach@chromium.org>
  Reviewed-by: Michael Achenbach <machenbach@chromium.org>
  Cr-Commit-Position: refs/heads/master@{#54485}

PR-URL: #23695
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Yang Guo <yangguo@chromium.org>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
  • Loading branch information
@MylesBorins
Vasili Skurydzin authored and MylesBorins committed Nov 22, 2018
1 parent d4c8d77 commit 01544e1
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 12 deletions.
2 changes: 1 addition & 1 deletion common.gypi
View file
Expand Up @@ -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.39',
'v8_embedder_string': '-node.40',

# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,
Expand Down
59 changes: 49 additions & 10 deletions deps/v8/infra/mb/mb_config.pyl
View file
Expand Up @@ -27,18 +27,27 @@
'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',
'ppc64.debug.sim': 'default_debug_ppc64_sim',
'ppc64.optdebug.sim': 'default_optdebug_ppc64_sim',
'ppc64.release.sim': 'default_release_ppc64_sim',
's390.debug': 'default_debug_s390',
's390.optdebug': 'default_optdebug_s390',
's390.release': 'default_release_s390',
's390.debug.sim': 'default_debug_s390_sim',
's390.optdebug.sim': 'default_optdebug_s390_sim',
's390.release.sim': 'default_release_s390_sim',
's390x.debug': 'default_debug_s390x',
's390x.optdebug': 'default_optdebug_s390x',
's390x.release': 'default_release_s390x',
's390x.debug.sim': 'default_debug_s390x_sim',
's390x.optdebug.sim': 'default_optdebug_s390x_sim',
's390x.release.sim': 'default_release_s390x_sim',
Expand Down Expand Up @@ -255,7 +264,6 @@

# 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': [
Expand Down Expand Up @@ -288,6 +296,12 @@
'debug', 'simulate_mips64el', 'v8_enable_slow_dchecks'],
'default_release_mips64el': [
'release', 'simulate_mips64el'],
'default_debug_ppc': [
'debug', 'ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
'default_optdebug_ppc': [
'debug', 'ppc', 'v8_enable_slow_dchecks'],
'default_release_ppc': [
'release', 'ppc'],
'default_debug_ppc_sim': [
'debug', 'simulate_ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
'default_optdebug_ppc_sim': [
Expand All @@ -296,22 +310,34 @@
'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_debug_ppc64_sim': [
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks', 'v8_full_debug'],
'default_optdebug_ppc64_sim': [
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks'],
'default_release_ppc64_sim': [
'release', 'simulate_ppc64'],
'default_debug_s390': [
'debug', 's390', 'v8_enable_slow_dchecks', 'v8_full_debug'],
'default_optdebug_s390': [
'debug', 's390', 'v8_enable_slow_dchecks'],
'default_release_s390': [
'release', 's390'],
'default_debug_s390_sim': [
'debug', 'simulate_s390', 'v8_enable_slow_dchecks', 'v8_full_debug'],
'default_optdebug_s390_sim': [
'debug', 'simulate_s390', 'v8_enable_slow_dchecks'],
'default_release_s390_sim': [
'release', 'simulate_s390'],
'default_debug_s390x': [
'debug', 's390x', 'v8_enable_slow_dchecks', 'v8_full_debug'],
'default_optdebug_s390x': [
'debug', 's390x', 'v8_enable_slow_dchecks'],
'default_release_s390x': [
'release', 's390x'],
'default_debug_s390x_sim': [
'debug', 'simulate_s390x', 'v8_enable_slow_dchecks', 'v8_full_debug'],
'default_optdebug_s390x_sim': [
Expand Down Expand Up @@ -826,6 +852,22 @@
'gn_args': 'v8_enable_verify_csa=true',
},

's390': {
'gn_args': 'target_cpu="s390x" v8_target_cpu="s390"',
},

's390x': {
'gn_args': 'target_cpu="s390x" v8_target_cpu="s390x"',
},

'ppc': {
'gn_args': 'target_cpu="ppc"',
},

'ppc64': {
'gn_args': 'target_cpu="ppc64" use_custom_libcxx=false',
},

'x64': {
'gn_args': 'target_cpu="x64"',
},
Expand All @@ -834,8 +876,5 @@
'gn_args': 'target_cpu="x86"',
},

'ppc64': {
'gn_args': 'target_cpu="ppc64"',
},
},
}
8 changes: 7 additions & 1 deletion deps/v8/tools/mb/mb.py
View file
Expand Up @@ -837,7 +837,13 @@ def GNCmd(self, subcommand, path, *args):
else:
subdir, exe = 'win', 'gn.exe'

gn_path = self.PathJoin(self.chromium_src_dir, 'buildtools', subdir, exe)
arch = platform.machine()
if (self.platform == 'linux2' and
(arch.startswith('s390') or arch.startswith('ppc'))):
# use gn in PATH
gn_path = 'gn'
else:
gn_path = self.PathJoin(self.chromium_src_dir, 'buildtools', subdir, exe)
return [gn_path, subcommand, path] + list(args)


Expand Down

0 comments on commit 01544e1

Please sign in to comment.