Skip to content

Commit abab9fb

Browse files
Vasili SkurydzinCommit Bot
Vasili Skurydzin
authored and
Commit Bot
committed
s390, ppc64: Enable v8gen.py on Linux s390, ppc64
Change-Id: Ia05e949e1a823e30a45894c47f6f6df2e159befe Reviewed-on: https://chromium-review.googlesource.com/1135540 Commit-Queue: Michael Achenbach <[email protected]> Reviewed-by: Michael Achenbach <[email protected]> Cr-Commit-Position: refs/heads/master@{#54485}
1 parent b7206fb commit abab9fb

2 files changed

Lines changed: 56 additions & 11 deletions

File tree

‎infra/mb/mb_config.pyl‎

Lines changed: 49 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,27 @@
2727
'mips64el.debug': 'default_debug_mips64el',
2828
'mips64el.optdebug': 'default_optdebug_mips64el',
2929
'mips64el.release': 'default_release_mips64el',
30+
'ppc.debug': 'default_debug_ppc',
31+
'ppc.optdebug': 'default_optdebug_ppc',
32+
'ppc.release': 'default_release_ppc',
3033
'ppc.debug.sim': 'default_debug_ppc_sim',
3134
'ppc.optdebug.sim': 'default_optdebug_ppc_sim',
3235
'ppc.release.sim': 'default_release_ppc_sim',
3336
'ppc64.debug': 'default_debug_ppc64',
34-
'ppc64.debug.sim': 'default_debug_ppc64_sim',
3537
'ppc64.optdebug': 'default_optdebug_ppc64',
36-
'ppc64.optdebug.sim': 'default_optdebug_ppc64_sim',
3738
'ppc64.release': 'default_release_ppc64',
39+
'ppc64.debug.sim': 'default_debug_ppc64_sim',
40+
'ppc64.optdebug.sim': 'default_optdebug_ppc64_sim',
3841
'ppc64.release.sim': 'default_release_ppc64_sim',
42+
's390.debug': 'default_debug_s390',
43+
's390.optdebug': 'default_optdebug_s390',
44+
's390.release': 'default_release_s390',
3945
's390.debug.sim': 'default_debug_s390_sim',
4046
's390.optdebug.sim': 'default_optdebug_s390_sim',
4147
's390.release.sim': 'default_release_s390_sim',
48+
's390x.debug': 'default_debug_s390x',
49+
's390x.optdebug': 'default_optdebug_s390x',
50+
's390x.release': 'default_release_s390x',
4251
's390x.debug.sim': 'default_debug_s390x_sim',
4352
's390x.optdebug.sim': 'default_optdebug_s390x_sim',
4453
's390x.release.sim': 'default_release_s390x_sim',
@@ -256,7 +265,6 @@
256265

257266
# To ease readability, config values are ordered by:
258267
# release/debug, arch type, other values alphabetically.
259-
# TODO: create separate native configurations for ppc,s390[x].
260268
'configs': {
261269
# Developer default configs.
262270
'default_debug_arm': [
@@ -289,6 +297,12 @@
289297
'debug', 'simulate_mips64el', 'v8_enable_slow_dchecks'],
290298
'default_release_mips64el': [
291299
'release', 'simulate_mips64el'],
300+
'default_debug_ppc': [
301+
'debug', 'ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
302+
'default_optdebug_ppc': [
303+
'debug', 'ppc', 'v8_enable_slow_dchecks'],
304+
'default_release_ppc': [
305+
'release', 'ppc'],
292306
'default_debug_ppc_sim': [
293307
'debug', 'simulate_ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
294308
'default_optdebug_ppc_sim': [
@@ -297,22 +311,34 @@
297311
'release', 'simulate_ppc'],
298312
'default_debug_ppc64': [
299313
'debug', 'ppc64', 'gcc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
300-
'default_debug_ppc64_sim': [
301-
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks', 'v8_full_debug'],
302314
'default_optdebug_ppc64': [
303315
'debug', 'ppc64', 'gcc', 'v8_enable_slow_dchecks'],
304-
'default_optdebug_ppc64_sim': [
305-
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks'],
306316
'default_release_ppc64': [
307317
'release', 'ppc64', 'gcc'],
318+
'default_debug_ppc64_sim': [
319+
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks', 'v8_full_debug'],
320+
'default_optdebug_ppc64_sim': [
321+
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks'],
308322
'default_release_ppc64_sim': [
309323
'release', 'simulate_ppc64'],
324+
'default_debug_s390': [
325+
'debug', 's390', 'v8_enable_slow_dchecks', 'v8_full_debug'],
326+
'default_optdebug_s390': [
327+
'debug', 's390', 'v8_enable_slow_dchecks'],
328+
'default_release_s390': [
329+
'release', 's390'],
310330
'default_debug_s390_sim': [
311331
'debug', 'simulate_s390', 'v8_enable_slow_dchecks', 'v8_full_debug'],
312332
'default_optdebug_s390_sim': [
313333
'debug', 'simulate_s390', 'v8_enable_slow_dchecks'],
314334
'default_release_s390_sim': [
315335
'release', 'simulate_s390'],
336+
'default_debug_s390x': [
337+
'debug', 's390x', 'v8_enable_slow_dchecks', 'v8_full_debug'],
338+
'default_optdebug_s390x': [
339+
'debug', 's390x', 'v8_enable_slow_dchecks'],
340+
'default_release_s390x': [
341+
'release', 's390x'],
316342
'default_debug_s390x_sim': [
317343
'debug', 'simulate_s390x', 'v8_enable_slow_dchecks', 'v8_full_debug'],
318344
'default_optdebug_s390x_sim': [
@@ -836,6 +862,22 @@
836862
'gn_args': 'v8_enable_verify_csa=true',
837863
},
838864

865+
's390': {
866+
'gn_args': 'target_cpu="s390x" v8_target_cpu="s390"',
867+
},
868+
869+
's390x': {
870+
'gn_args': 'target_cpu="s390x" v8_target_cpu="s390x"',
871+
},
872+
873+
'ppc': {
874+
'gn_args': 'target_cpu="ppc"',
875+
},
876+
877+
'ppc64': {
878+
'gn_args': 'target_cpu="ppc64" use_custom_libcxx=false',
879+
},
880+
839881
'x64': {
840882
'gn_args': 'target_cpu="x64"',
841883
},
@@ -844,8 +886,5 @@
844886
'gn_args': 'target_cpu="x86"',
845887
},
846888

847-
'ppc64': {
848-
'gn_args': 'target_cpu="ppc64"',
849-
},
850889
},
851890
}

‎tools/mb/mb.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,13 @@ def GNCmd(self, subcommand, path, *args):
837837
else:
838838
subdir, exe = 'win', 'gn.exe'
839839

840-
gn_path = self.PathJoin(self.chromium_src_dir, 'buildtools', subdir, exe)
840+
arch = platform.machine()
841+
if (self.platform == 'linux2' and
842+
(arch.startswith('s390') or arch.startswith('ppc'))):
843+
# use gn in PATH
844+
gn_path = 'gn'
845+
else:
846+
gn_path = self.PathJoin(self.chromium_src_dir, 'buildtools', subdir, exe)
841847
return [gn_path, subcommand, path] + list(args)
842848

843849

0 commit comments

Comments
 (0)