Fix QEMU cross-compile build

Introduce the per-arch IOEMU_CPU_ARCH variable.
Always pass --configure=IOEMU_CPU_ARCH to QEMU's configure script.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc -- dropped redundant comments ]

diff --git a/config/arm32.mk b/config/arm32.mk
index aa79d228c6f12427724231534567c4aacf0141f7..4f83a63bf998cc7d48fb344e183ebd96bb3a135e 100644 (file)
--- a/config/arm32.mk
+++ b/config/arm32.mk
@@ -18,3 +18,5 @@ HAS_NS16550 := y
 LDFLAGS_DIRECT += -EL
 
 CONFIG_LOAD_ADDRESS ?= 0x80000000
+
+IOEMU_CPU_ARCH ?= arm

diff --git a/config/arm64.mk b/config/arm64.mk
index 15b57a457a1c2b13e515c242245dc0f5d39c5e26..4e57b3a3cb4f1e48fe3c06ae3874533e85e2f2a4 100644 (file)
--- a/config/arm64.mk
+++ b/config/arm64.mk
@@ -13,3 +13,5 @@ HAS_NS16550 := y
 LDFLAGS_DIRECT += -EL
 
 CONFIG_LOAD_ADDRESS ?= 0x80000000
+
+IOEMU_CPU_ARCH ?= aarch64

diff --git a/config/x86_32.mk b/config/x86_32.mk
index 7f76b256a3cb70eacc5453cfbd07970a8b31c8df..6121fdc4ceb8fcd042593a36493ca3a04b0ab449 100644 (file)
--- a/config/x86_32.mk
+++ b/config/x86_32.mk
@@ -12,3 +12,5 @@ CFLAGS += -m32 -march=i686
 LDFLAGS_DIRECT_OpenBSD = _obsd
 LDFLAGS_DIRECT_FreeBSD = _fbsd
 LDFLAGS_DIRECT += -melf_i386$(LDFLAGS_DIRECT_$(XEN_OS))
+
+IOEMU_CPU_ARCH ?= i386

diff --git a/config/x86_64.mk b/config/x86_64.mk
index 11104bdc055d50f530321660656faf1b019c7dfb..1b974766c0829c94bdc2ff98da3be5d0eed19ec6 100644 (file)
--- a/config/x86_64.mk
+++ b/config/x86_64.mk
@@ -25,3 +25,5 @@ else
 LDFLAGS_DIRECT += -melf_x86_64
 endif
 endif
+
+IOEMU_CPU_ARCH ?= x86_64

diff --git a/tools/Makefile b/tools/Makefile
index 81ce7afae2350cb37ae7ac2d7b15dbcbd8ee6fd9..00f539ac2cc1779aac1ccbc2b658b43d598f5e7f 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -106,8 +106,7 @@ distclean: subdirs-distclean
                config.cache autom4te.cache
 
 ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
-IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
-                        --cross-prefix=$(CROSS_COMPILE) \
+IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \
                         --interp-prefix=$(CROSS_SYS_ROOT)
 endif
 
@@ -146,7 +145,7 @@ subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
        set -e; \
                $(buildmakevars2shellvars); \
                cd qemu-xen-traditional-dir; \
-               $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS); \
+               $(QEMU_ROOT)/xen-setup --cpu=$(IOEMU_CPU_ARCH) $(IOEMU_CONFIGURE_CROSS); \
                $(MAKE) all
 
 subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
@@ -155,6 +154,7 @@ subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
                cd qemu-xen-traditional-dir; \
                $(QEMU_ROOT)/xen-setup \
                --extra-cflags="$(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \
+               --cpu=$(IOEMU_CPU_ARCH) \
                $(IOEMU_CONFIGURE_CROSS); \
                $(MAKE) install
 
@@ -207,6 +207,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
                --disable-guest-agent \
                --python=$(PYTHON) \
                $(CONFIG_QEMUU_EXTRA_ARGS) \
+               --cpu=$(IOEMU_CPU_ARCH) \
                $(IOEMU_CONFIGURE_CROSS); \
        $(MAKE) all