[gn] Fix remaining ia32/x86 misconfigurations

infra/mb/mb_config.pyl

 # Copyright 2016 The V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   # Bots are ordered by appearance on waterfall.
   'masters': {
@@ skipping 474 matching lines @@
     'release_trybot': {
       'mixins': ['release_bot', 'minimal_symbols', 'dcheck_always_on'],
     },
 
     'shared': {
       'gn_args': 'is_component_build=true',
       'gyp_defines': 'component=shared_library',
     },
 
     'simulate_arm': {
-      'gn_args': 'target_cpu="ia32" v8_target_cpu="arm"',
+      'gn_args': 'target_cpu="x86" v8_target_cpu="arm"',
       'gyp_defines': 'target_arch=ia32 v8_target_arch=arm',
     },
 
     'simulate_arm64': {
       'gn_args': 'target_cpu="x64" v8_target_cpu="arm64"',
       'gyp_defines': 'target_arch=x64 v8_target_arch=arm64',
     },
 
     'simulate_mipsel': {
-      'gn_args': 'target_cpu="ia32" v8_target_cpu="mipsel"',
+      'gn_args': 'target_cpu="x86" v8_target_cpu="mipsel"',
       'gyp_defines': 'target_arch=ia32 v8_target_arch=mipsel',
     },
 
     'simulate_mips64el': {
       'gn_args': 'target_cpu="x64" v8_target_cpu="mips64el"',
       'gyp_defines': 'target_arch=x64 v8_target_arch=mips64el',
     },
 
     'simulate_ppc': {
-      'gn_args': 'target_cpu="ia32" v8_target_cpu="ppc"',
+      'gn_args': 'target_cpu="x86" v8_target_cpu="ppc"',
       'gyp_defines': 'target_arch=ia32 v8_target_arch=ppc',
     },
 
     'simulate_ppc64': {
       'gn_args': 'target_cpu="x64" v8_target_cpu="ppc64"',
       'gyp_defines': 'target_arch=x64 v8_target_arch=ppc64',
     },
 
     'simulate_s390': {
-      'gn_args': 'target_cpu="ia32" v8_target_cpu="s390"',
+      'gn_args': 'target_cpu="x86" v8_target_cpu="s390"',
       'gyp_defines': 'target_arch=ia32 v8_target_arch=s390',
     },
 
     'simulate_s390x': {
       'gn_args': 'target_cpu="x64" v8_target_cpu="s390x"',
       'gyp_defines': 'target_arch=x64 v8_target_arch=s390x',
     },
 
     'simulate_x87': {
-      'gn_args': 'target_cpu="ia32" v8_target_cpu="x87"',
+      'gn_args': 'target_cpu="x86" v8_target_cpu="x87"',
       'gyp_defines': 'target_arch=ia32 v8_target_arch=x87',
     },
 
     'static': {
       'gn_args': 'is_component_build=false',
       'gyp_defines': 'component=static_library',
     },
 
     'swarming': {
       'gn_args': 'v8_test_isolation_mode="prepare"',
@@ skipping 84 matching lines @@
       'gn_args': 'target_cpu="x64"',
       'gyp_defines': 'target_arch=x64',
     },
 
     'x86': {
       'gn_args': 'target_cpu="x86"',
       'gyp_defines': 'target_arch=ia32',
     },
   },
 }