Correct QEMU_ARCH to use x86_64 rather than amd64.
The default ARCH is not the qemu suffix needed on amd64. This
maps amd64 to x86_64 for qemu executables.
BUG=chromium-os:22309
TEST=`sudo FEATURES="test" emerge-amd64-generic verity` passes now
Change-Id: I5bd98aa18ec6516e44ae2336e045d05af3bef6c6
Reviewed-on: https://gerrit.chromium.org/gerrit/11824
Tested-by: Matt Tennant <mtennant@chromium.org>
Reviewed-by: Anush Elangovan <anush@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Will Drewry <wad@chromium.org>
Commit-Ready: Matt Tennant <mtennant@chromium.org>
diff --git a/common.mk b/common.mk
index dbd34d1..c1dc71c 100644
--- a/common.mk
+++ b/common.mk
@@ -38,7 +38,8 @@
# - COLOR=[0|1] to set ANSI color output (default: 1)
# - VERBOSE=[0|1] to hide/show commands (default: 0)
# - MODE=dbg to turn down optimizations (default: opt)
-# - ARCH=[x86|arm|supported qemu name] (default: from portage or uname -m)
+# - ARCH=[x86|amd64|arm|supported qemu name]
+# (default: from portage or uname -m)
# - SPLITDEBUG=[0|1] splits debug info in target.debug (default: 1)
# [SPLITDEBUG=0 MODE=opt will disable compiling with -g]
# - VALGRIND=[0|1] runs tests under valgrind (default: 0)
@@ -303,15 +304,15 @@
# Architecture detection and QEMU wrapping
#
-ARCH ?= $(shell uname -m)
HOST_ARCH ?= $(shell uname -m)
# emake will supply "x86" or "arm" for ARCH, but
# if uname -m runs and you get x86_64, then this subst
# will break.
+QEMU_ARCH = $(ARCH)
ifeq ($(subst x86,i386,$(ARCH)),i386)
QEMU_ARCH := $(subst x86,i386,$(ARCH)) # x86 -> i386
-else
- QEMU_ARCH = $(ARCH)
+else ifeq ($(subst amd64,x86_64,$(ARCH)),x86_64)
+ QEMU_ARCH := $(subst amd64,x86_64,$(ARCH)) # amd64 -> x86_64
endif
# If we're cross-compiling, try to use qemu for running the tests.
