Skip to content

Commit 01544e1

Browse files
Vasili SkurydzinMylesBorins
Vasili Skurydzin
authored andcommitted
deps: cherry-pick abab9fb from V8 upstream
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 <[email protected]> Reviewed-by: Michael Achenbach <[email protected]> Cr-Commit-Position: refs/heads/master@{#54485} PR-URL: #23695 Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Yang Guo <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]>
1 parent d4c8d77 commit 01544e1

File tree

3 files changed

+57
-12
lines changed

3 files changed

+57
-12
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
# Reset this number to 0 on major V8 upgrades.
3535
# Increment by one for each non-official patch applied to deps/v8.
36-
'v8_embedder_string': '-node.39',
36+
'v8_embedder_string': '-node.40',
3737

3838
# Enable disassembler for `--print-code` v8 options
3939
'v8_enable_disassembler': 1,

deps/v8/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',
@@ -255,7 +264,6 @@
255264

256265
# To ease readability, config values are ordered by:
257266
# release/debug, arch type, other values alphabetically.
258-
# TODO: create separate native configurations for ppc,s390[x].
259267
'configs': {
260268
# Developer default configs.
261269
'default_debug_arm': [
@@ -288,6 +296,12 @@
288296
'debug', 'simulate_mips64el', 'v8_enable_slow_dchecks'],
289297
'default_release_mips64el': [
290298
'release', 'simulate_mips64el'],
299+
'default_debug_ppc': [
300+
'debug', 'ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
301+
'default_optdebug_ppc': [
302+
'debug', 'ppc', 'v8_enable_slow_dchecks'],
303+
'default_release_ppc': [
304+
'release', 'ppc'],
291305
'default_debug_ppc_sim': [
292306
'debug', 'simulate_ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
293307
'default_optdebug_ppc_sim': [
@@ -296,22 +310,34 @@
296310
'release', 'simulate_ppc'],
297311
'default_debug_ppc64': [
298312
'debug', 'ppc64', 'gcc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
299-
'default_debug_ppc64_sim': [
300-
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks', 'v8_full_debug'],
301313
'default_optdebug_ppc64': [
302314
'debug', 'ppc64', 'gcc', 'v8_enable_slow_dchecks'],
303-
'default_optdebug_ppc64_sim': [
304-
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks'],
305315
'default_release_ppc64': [
306316
'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'],
307321
'default_release_ppc64_sim': [
308322
'release', 'simulate_ppc64'],
323+
'default_debug_s390': [
324+
'debug', 's390', 'v8_enable_slow_dchecks', 'v8_full_debug'],
325+
'default_optdebug_s390': [
326+
'debug', 's390', 'v8_enable_slow_dchecks'],
327+
'default_release_s390': [
328+
'release', 's390'],
309329
'default_debug_s390_sim': [
310330
'debug', 'simulate_s390', 'v8_enable_slow_dchecks', 'v8_full_debug'],
311331
'default_optdebug_s390_sim': [
312332
'debug', 'simulate_s390', 'v8_enable_slow_dchecks'],
313333
'default_release_s390_sim': [
314334
'release', 'simulate_s390'],
335+
'default_debug_s390x': [
336+
'debug', 's390x', 'v8_enable_slow_dchecks', 'v8_full_debug'],
337+
'default_optdebug_s390x': [
338+
'debug', 's390x', 'v8_enable_slow_dchecks'],
339+
'default_release_s390x': [
340+
'release', 's390x'],
315341
'default_debug_s390x_sim': [
316342
'debug', 'simulate_s390x', 'v8_enable_slow_dchecks', 'v8_full_debug'],
317343
'default_optdebug_s390x_sim': [
@@ -826,6 +852,22 @@
826852
'gn_args': 'v8_enable_verify_csa=true',
827853
},
828854

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+
829871
'x64': {
830872
'gn_args': 'target_cpu="x64"',
831873
},
@@ -834,8 +876,5 @@
834876
'gn_args': 'target_cpu="x86"',
835877
},
836878

837-
'ppc64': {
838-
'gn_args': 'target_cpu="ppc64"',
839-
},
840879
},
841880
}

deps/v8/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)