Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit d4c8d77

Browse filesBrowse files
Vasili SkurydzinMylesBorins
Vasili Skurydzin
authored and
MylesBorins
committed
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 <machenbach@chromium.org> Reviewed-by: Michael Achenbach <machenbach@chromium.org> Cr-Commit-Position: refs/heads/master@{#54386} 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>
1 parent 469473d commit d4c8d77
Copy full SHA for d4c8d77

File tree

Expand file treeCollapse file tree

4 files changed

+38
-19
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

4 files changed

+38
-19
lines changed
Open diff view settings
Collapse file

‎common.gypi‎

Copy file name to clipboardExpand all lines: common.gypi
+1-1Lines 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.38',
36+
'v8_embedder_string': '-node.39',
3737

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

‎deps/v8/infra/mb/mb_config.pyl‎

Copy file name to clipboardExpand all lines: deps/v8/infra/mb/mb_config.pyl
+32-18Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,21 @@
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',
30+
'ppc.debug.sim': 'default_debug_ppc_sim',
31+
'ppc.optdebug.sim': 'default_optdebug_ppc_sim',
32+
'ppc.release.sim': 'default_release_ppc_sim',
3333
'ppc64.debug': 'default_debug_ppc64',
34+
'ppc64.debug.sim': 'default_debug_ppc64_sim',
3435
'ppc64.optdebug': 'default_optdebug_ppc64',
36+
'ppc64.optdebug.sim': 'default_optdebug_ppc64_sim',
3537
'ppc64.release': 'default_release_ppc64',
36-
's390.debug': 'default_debug_s390',
37-
's390.optdebug': 'default_optdebug_s390',
38-
's390.release': 'default_release_s390',
39-
's390x.debug': 'default_debug_s390x',
40-
's390x.optdebug': 'default_optdebug_s390x',
41-
's390x.release': 'default_release_s390x',
38+
'ppc64.release.sim': 'default_release_ppc64_sim',
39+
's390.debug.sim': 'default_debug_s390_sim',
40+
's390.optdebug.sim': 'default_optdebug_s390_sim',
41+
's390.release.sim': 'default_release_s390_sim',
42+
's390x.debug.sim': 'default_debug_s390x_sim',
43+
's390x.optdebug.sim': 'default_optdebug_s390x_sim',
44+
's390x.release.sim': 'default_release_s390x_sim',
4245
'x64.debug': 'default_debug_x64',
4346
'x64.optdebug': 'default_optdebug_x64',
4447
'x64.release': 'default_release_x64',
@@ -252,6 +255,7 @@
252255

253256
# To ease readability, config values are ordered by:
254257
# release/debug, arch type, other values alphabetically.
258+
# TODO: create separate native configurations for ppc,s390[x].
255259
'configs': {
256260
# Developer default configs.
257261
'default_debug_arm': [
@@ -284,29 +288,35 @@
284288
'debug', 'simulate_mips64el', 'v8_enable_slow_dchecks'],
285289
'default_release_mips64el': [
286290
'release', 'simulate_mips64el'],
287-
'default_debug_ppc': [
291+
'default_debug_ppc_sim': [
288292
'debug', 'simulate_ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
289-
'default_optdebug_ppc': [
293+
'default_optdebug_ppc_sim': [
290294
'debug', 'simulate_ppc', 'v8_enable_slow_dchecks'],
291-
'default_release_ppc': [
295+
'default_release_ppc_sim': [
292296
'release', 'simulate_ppc'],
293297
'default_debug_ppc64': [
298+
'debug', 'ppc64', 'gcc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
299+
'default_debug_ppc64_sim': [
294300
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks', 'v8_full_debug'],
295301
'default_optdebug_ppc64': [
302+
'debug', 'ppc64', 'gcc', 'v8_enable_slow_dchecks'],
303+
'default_optdebug_ppc64_sim': [
296304
'debug', 'simulate_ppc64', 'v8_enable_slow_dchecks'],
297305
'default_release_ppc64': [
306+
'release', 'ppc64', 'gcc'],
307+
'default_release_ppc64_sim': [
298308
'release', 'simulate_ppc64'],
299-
'default_debug_s390': [
309+
'default_debug_s390_sim': [
300310
'debug', 'simulate_s390', 'v8_enable_slow_dchecks', 'v8_full_debug'],
301-
'default_optdebug_s390': [
311+
'default_optdebug_s390_sim': [
302312
'debug', 'simulate_s390', 'v8_enable_slow_dchecks'],
303-
'default_release_s390': [
313+
'default_release_s390_sim': [
304314
'release', 'simulate_s390'],
305-
'default_debug_s390x': [
315+
'default_debug_s390x_sim': [
306316
'debug', 'simulate_s390x', 'v8_enable_slow_dchecks', 'v8_full_debug'],
307-
'default_optdebug_s390x': [
317+
'default_optdebug_s390x_sim': [
308318
'debug', 'simulate_s390x', 'v8_enable_slow_dchecks'],
309-
'default_release_s390x': [
319+
'default_release_s390x_sim': [
310320
'release', 'simulate_s390x'],
311321
'default_debug_x64': [
312322
'debug', 'x64', 'v8_enable_slow_dchecks', 'v8_full_debug'],
@@ -823,5 +833,9 @@
823833
'x86': {
824834
'gn_args': 'target_cpu="x86"',
825835
},
836+
837+
'ppc64': {
838+
'gn_args': 'target_cpu="ppc64"',
839+
},
826840
},
827841
}
Collapse file

‎deps/v8/third_party/antlr4/BUILD.gn‎

Copy file name to clipboardExpand all lines: deps/v8/third_party/antlr4/BUILD.gn
+3Lines 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") {
Collapse file

‎deps/v8/tools/mb/mb.py‎

Copy file name to clipboardExpand all lines: deps/v8/tools/mb/mb.py
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,8 @@ 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

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.