[build] Ensure target_arch is set correctly in toplevel Makefile

Makefile

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 232 matching lines @@
 # - "nacl" : cross-compile for Native Client (ia32 and x64)
 # - default (no target specified): build all DEFAULT_ARCHES and MODES
 # - "check": build all targets and run all tests
 # - "<arch>.clean" for any <arch> in ARCHES
 # - "clean": clean all ARCHES
 
 # ----------------- internal stuff ------------------------
 
 # Architectures and modes to be compiled. Consider these to be internal
 # variables, don't override them (use the targets instead).
-ARCHES = ia32 x64 x32 arm arm64 mips mipsel mips64 mips64el x87 ppc ppc64 \
-                 s390 s390x
+ARCHES = ia32 x64 arm arm64 mips mipsel mips64 mips64el x87 ppc ppc64 s390 \
+         s390x
+ARCHES32 = ia32 arm mips mipsel x87 ppc s390
 DEFAULT_ARCHES = ia32 x64 arm
 MODES = release debug optdebug
 DEFAULT_MODES = release debug
 ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
                  android_mipsel android_x87
 NACL_ARCHES = nacl_ia32 nacl_x64
 
 # List of files that trigger Makefile regeneration:
 GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
            gypfiles/shim_headers.gypi gypfiles/features.gypi \
@@ skipping 182 matching lines @@
                 cut -f 2 -d " " | cut -f 1 -d "-" ))
         $(eval CXX_TARGET_ARCH:=$(subst aarch64,arm64,$(CXX_TARGET_ARCH)))
         $(eval CXX_TARGET_ARCH:=$(subst x86_64,x64,$(CXX_TARGET_ARCH)))
         $(eval V8_TARGET_ARCH:=$(subst .,,$(suffix $(basename $@))))
         PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/gypfiles:$(PYTHONPATH):$(shell pwd)/tools/gyp/pylib:$(PYTHONPATH)" \
         GYP_GENERATORS=make \
         tools/gyp/gyp --generator-output="$(OUTDIR)" gypfiles/all.gyp \
                       -Igypfiles/standalone.gypi --depth=. \
                       -Dv8_target_arch=$(V8_TARGET_ARCH) \
                       $(if $(findstring $(CXX_TARGET_ARCH),$(V8_TARGET_ARCH)), \
-                      -Dtarget_arch=$(V8_TARGET_ARCH),) \
+                      -Dtarget_arch=$(V8_TARGET_ARCH), \
+                          $(if $(shell echo $(ARCHES32) | grep $(V8_TARGET_ARCH)), \
+                          -Dtarget_arch=ia32,)) \
                       $(if $(findstring optdebug,$@),-Dv8_optimized_debug=1,) \
                       -S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS)
 
 $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
         PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/gypfiles:$(PYTHONPATH):$(shell pwd)/tools/gyp/pylib:$(PYTHONPATH)" \
         GYP_GENERATORS=make \
         tools/gyp/gyp --generator-output="$(OUTDIR)" gypfiles/all.gyp \
                       -Igypfiles/standalone.gypi --depth=. -S.native $(GYPFLAGS)
 
 # Note that NACL_SDK_ROOT must be set to point to an appropriate
@@ skipping 46 matching lines @@
 tags: gtags.files $(wildcard $(shell cat gtags.files 2> /dev/null))
         @(ctags --version | grep 'Exuberant Ctags' >/dev/null) || \
                 (echo "Please install Exuberant Ctags (check 'ctags --version')" >&2; false)
         ctags --fields=+l -L $<
 
 tags.clean:
         rm -r tags
 
 dependencies builddeps:
         $(error Use 'gclient sync' instead)