Skip to content

Commit d345750

Browse files
Vasili SkurydzinCommit Bot
Vasili Skurydzin
authored and
Commit Bot
committed
Merged: Squashed multiple commits.
Merged: fix gn builds on aix Revision: d9e7832 Merged: s390, ppc64: Enable v8gen.py on Linux s390, ppc64 Revision: abab9fb NOTRY=true NOPRESUBMIT=true NOTREECHECKS=true [email protected] Change-Id: Iadd3b9e560d0e2f2427ba687340d6aba20a66291 Reviewed-on: https://chromium-review.googlesource.com/1169942 Reviewed-by: John Barboza <[email protected]> Reviewed-by: Michael Achenbach <[email protected]> Commit-Queue: John Barboza <[email protected]> Cr-Commit-Position: refs/branch-heads/6.8@{#54} Cr-Branched-From: 44d7d7d-refs/heads/6.8.275@{#1} Cr-Branched-From: 5754f66-refs/heads/master@{#53286}
1 parent 47a7e96 commit d345750

3 files changed

Lines changed: 73 additions & 9 deletions

File tree

‎infra/mb/mb_config.pyl‎

Lines changed: 61 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,27 @@
3030
'ppc.debug': 'default_debug_ppc',
3131
'ppc.optdebug': 'default_optdebug_ppc',
3232
'ppc.release': 'default_release_ppc',
33+
'ppc.debug.sim': 'default_debug_ppc_sim',
34+
'ppc.optdebug.sim': 'default_optdebug_ppc_sim',
35+
'ppc.release.sim': 'default_release_ppc_sim',
3336
'ppc64.debug': 'default_debug_ppc64',
3437
'ppc64.optdebug': 'default_optdebug_ppc64',
3538
'ppc64.release': 'default_release_ppc64',
39+
'ppc64.debug.sim': 'default_debug_ppc64_sim',
40+
'ppc64.optdebug.sim': 'default_optdebug_ppc64_sim',
41+
'ppc64.release.sim': 'default_release_ppc64_sim',
3642
's390.debug': 'default_debug_s390',
3743
's390.optdebug': 'default_optdebug_s390',
3844
's390.release': 'default_release_s390',
45+
's390.debug.sim': 'default_debug_s390_sim',
46+
's390.optdebug.sim': 'default_optdebug_s390_sim',
47+
's390.release.sim': 'default_release_s390_sim',
3948
's390x.debug': 'default_debug_s390x',
4049
's390x.optdebug': 'default_optdebug_s390x',
4150
's390x.release': 'default_release_s390x',
51+
's390x.debug.sim': 'default_debug_s390x_sim',
52+
's390x.optdebug.sim': 'default_optdebug_s390x_sim',
53+
's390x.release.sim': 'default_release_s390x_sim',
4254
'x64.debug': 'default_debug_x64',
4355
'x64.optdebug': 'default_optdebug_x64',
4456
'x64.release': 'default_release_x64',
@@ -285,28 +297,52 @@
285297
'default_release_mips64el': [
286298
'release', 'simulate_mips64el'],
287299
'default_debug_ppc': [
288-
'debug', 'simulate_ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
300+
'debug', 'ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
289301
'default_optdebug_ppc': [
290-
'debug', 'simulate_ppc', 'v8_enable_slow_dchecks'],
302+
'debug', 'ppc', 'v8_enable_slow_dchecks'],
291303
'default_release_ppc': [
304+
'release', 'ppc'],
305+
'default_debug_ppc_sim': [
306+
'debug', 'simulate_ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
307+
'default_optdebug_ppc_sim': [
308+
'debug', 'simulate_ppc', 'v8_enable_slow_dchecks'],
309+
'default_release_ppc_sim': [
292310
'release', 'simulate_ppc'],
293311
'default_debug_ppc64': [
294-
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks', 'v8_full_debug'],
312+
'debug', 'ppc64', 'gcc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
295313
'default_optdebug_ppc64': [
296-
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks'],
314+
'debug', 'ppc64', 'gcc', 'v8_enable_slow_dchecks'],
297315
'default_release_ppc64': [
316+
'release', 'ppc64', 'gcc'],
317+
'default_debug_ppc64_sim': [
318+
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks', 'v8_full_debug'],
319+
'default_optdebug_ppc64_sim': [
320+
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks'],
321+
'default_release_ppc64_sim': [
298322
'release', 'simulate_ppc64'],
299323
'default_debug_s390': [
300-
'debug', 'simulate_s390', 'v8_enable_slow_dchecks', 'v8_full_debug'],
324+
'debug', 's390', 'v8_enable_slow_dchecks', 'v8_full_debug'],
301325
'default_optdebug_s390': [
302-
'debug', 'simulate_s390', 'v8_enable_slow_dchecks'],
326+
'debug', 's390', 'v8_enable_slow_dchecks'],
303327
'default_release_s390': [
328+
'release', 's390'],
329+
'default_debug_s390_sim': [
330+
'debug', 'simulate_s390', 'v8_enable_slow_dchecks', 'v8_full_debug'],
331+
'default_optdebug_s390_sim': [
332+
'debug', 'simulate_s390', 'v8_enable_slow_dchecks'],
333+
'default_release_s390_sim': [
304334
'release', 'simulate_s390'],
305335
'default_debug_s390x': [
306-
'debug', 'simulate_s390x', 'v8_enable_slow_dchecks', 'v8_full_debug'],
336+
'debug', 's390x', 'v8_enable_slow_dchecks', 'v8_full_debug'],
307337
'default_optdebug_s390x': [
308-
'debug', 'simulate_s390x', 'v8_enable_slow_dchecks'],
338+
'debug', 's390x', 'v8_enable_slow_dchecks'],
309339
'default_release_s390x': [
340+
'release', 's390x'],
341+
'default_debug_s390x_sim': [
342+
'debug', 'simulate_s390x', 'v8_enable_slow_dchecks', 'v8_full_debug'],
343+
'default_optdebug_s390x_sim': [
344+
'debug', 'simulate_s390x', 'v8_enable_slow_dchecks'],
345+
'default_release_s390x_sim': [
310346
'release', 'simulate_s390x'],
311347
'default_debug_x64': [
312348
'debug', 'x64', 'v8_enable_slow_dchecks', 'v8_full_debug'],
@@ -816,12 +852,29 @@
816852
'gn_args': 'v8_enable_verify_csa=true',
817853
},
818854

855+
's390': {
856+
'gn_args': 'target_cpu="s390x" v8_target_cpu="s390"',
857+
},
858+
859+
's390x': {
860+
'gn_args': 'target_cpu="s390x" v8_target_cpu="s390x"',
861+
},
862+
863+
'ppc': {
864+
'gn_args': 'target_cpu="ppc"',
865+
},
866+
867+
'ppc64': {
868+
'gn_args': 'target_cpu="ppc64" use_custom_libcxx=false',
869+
},
870+
819871
'x64': {
820872
'gn_args': 'target_cpu="x64"',
821873
},
822874

823875
'x86': {
824876
'gn_args': 'target_cpu="x86"',
825877
},
878+
826879
},
827880
}

‎third_party/antlr4/BUILD.gn‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ config("antlr-compatibility") {
99
"-Wno-unused-but-set-variable",
1010
]
1111
}
12+
if (is_aix) {
13+
cflags += [ "-fdollars-in-identifiers" ]
14+
}
1215
}
1316

1417
source_set("antlr4") {

‎tools/mb/mb.py‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,10 +832,18 @@ def GNCmd(self, subcommand, path, *args):
832832
subdir, exe = 'linux64', 'gn'
833833
elif self.platform == 'darwin':
834834
subdir, exe = 'mac', 'gn'
835+
elif self.platform == 'aix6':
836+
subdir, exe = 'aix', 'gn'
835837
else:
836838
subdir, exe = 'win', 'gn.exe'
837839

838-
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)
839847
return [gn_path, subcommand, path] + list(args)
840848

841849

0 commit comments

Comments
 (0)