fix gn builds on aix

jBarz · Commit Bot · commit d9e78322d037 · 2018-07-12T07:28:36.000Z
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}
diff --git a/infra/mb/mb_config.pyl b/infra/mb/mb_config.pyl
@@ -27,18 +27,21 @@
       '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',
-      's390.debug': 'default_debug_s390',
-      's390.optdebug': 'default_optdebug_s390',
-      's390.release': 'default_release_s390',
-      's390x.debug': 'default_debug_s390x',
-      's390x.optdebug': 'default_optdebug_s390x',
-      's390x.release': 'default_release_s390x',
+      'ppc64.release.sim': 'default_release_ppc64_sim',
+      's390.debug.sim': 'default_debug_s390_sim',
+      's390.optdebug.sim': 'default_optdebug_s390_sim',
+      's390.release.sim': 'default_release_s390_sim',
+      's390x.debug.sim': 'default_debug_s390x_sim',
+      's390x.optdebug.sim': 'default_optdebug_s390x_sim',
+      's390x.release.sim': 'default_release_s390x_sim',
       'x64.debug': 'default_debug_x64',
       'x64.optdebug': 'default_optdebug_x64',
       'x64.release': 'default_release_x64',
@@ -253,6 +256,7 @@
 
   # 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': [
@@ -285,29 +289,35 @@
       'debug', 'simulate_mips64el', 'v8_enable_slow_dchecks'],
     'default_release_mips64el': [
       'release', 'simulate_mips64el'],
-    'default_debug_ppc': [
+    'default_debug_ppc_sim': [
       'debug', 'simulate_ppc', 'v8_enable_slow_dchecks', 'v8_full_debug'],
-    'default_optdebug_ppc': [
+    'default_optdebug_ppc_sim': [
       'debug', 'simulate_ppc', 'v8_enable_slow_dchecks'],
-    'default_release_ppc': [
+    'default_release_ppc_sim': [
       '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_release_ppc64_sim': [
       'release', 'simulate_ppc64'],
-    'default_debug_s390': [
+    'default_debug_s390_sim': [
       'debug', 'simulate_s390', 'v8_enable_slow_dchecks', 'v8_full_debug'],
-    'default_optdebug_s390': [
+    'default_optdebug_s390_sim': [
       'debug', 'simulate_s390', 'v8_enable_slow_dchecks'],
-    'default_release_s390': [
+    'default_release_s390_sim': [
       'release', 'simulate_s390'],
-    'default_debug_s390x': [
+    'default_debug_s390x_sim': [
       'debug', 'simulate_s390x', 'v8_enable_slow_dchecks', 'v8_full_debug'],
-    'default_optdebug_s390x': [
+    'default_optdebug_s390x_sim': [
       'debug', 'simulate_s390x', 'v8_enable_slow_dchecks'],
-    'default_release_s390x': [
+    'default_release_s390x_sim': [
       'release', 'simulate_s390x'],
     'default_debug_x64': [
       'debug', 'x64', 'v8_enable_slow_dchecks', 'v8_full_debug'],
@@ -833,5 +843,9 @@
     'x86': {
       'gn_args': 'target_cpu="x86"',
     },
+
+    'ppc64': {
+      'gn_args': 'target_cpu="ppc64"',
+    },
   },
 }
diff --git a/third_party/antlr4/BUILD.gn b/third_party/antlr4/BUILD.gn
@@ -9,6 +9,9 @@ config("antlr-compatibility") {
       "-Wno-unused-but-set-variable",
     ]
   }
+  if (is_aix) {
+    cflags += [ "-fdollars-in-identifiers" ]
+  }
 }
 
 source_set("antlr4") {
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
@@ -832,6 +832,8 @@ def GNCmd(self, subcommand, path, *args):
       subdir, exe = 'linux64', 'gn'
     elif self.platform == 'darwin':
       subdir, exe = 'mac', 'gn'
+    elif self.platform == 'aix6':
+      subdir, exe = 'aix', 'gn'
     else:
       subdir, exe = 'win', 'gn.exe'
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@ config("antlr-compatibility") {`
`9`	`9`	`"-Wno-unused-but-set-variable",`
`10`	`10`	`]`
`11`	`11`	`}`
	`12`	`+ if (is_aix) {`
	`13`	`+ cflags += [ "-fdollars-in-identifiers" ]`
	`14`	`+ }`
`12`	`15`	`}`
`13`	`16`
`14`	`17`	`source_set("antlr4") {`