Signed-off-by: Scott Wood <scottw...@freescale.com> --- Build tested on ppc and x86, but not arm as I currently lack a suitable toolchain.
Maybe TARGET_I386 should be set on x86_64, instead of needing to test TARGET_BASE_ARCH in Makefile.objs? It seems odd that it's set for x86_64 in C code, but not in the makefiles. --- hw/Makefile.objs | 1 + hw/arm/Makefile.objs | 1 - hw/i386/Makefile.objs | 1 - hw/kvm/Makefile.objs | 7 ++++++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d0b2ecb..3ce4ccd 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -216,4 +216,5 @@ obj-$(CONFIG_KVM) += ivshmem.o obj-$(CONFIG_LINUX) += vfio_pci.o endif +obj-$(CONFIG_KVM) += kvm/ endif diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index f5f7d0e..aebbc86 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -23,7 +23,6 @@ obj-y += bitbang_i2c.o marvell_88w8618_audio.o obj-y += framebuffer.o obj-y += strongarm.o obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o -obj-$(CONFIG_KVM) += kvm/arm_gic.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index a78c0b2..5c54054 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -9,7 +9,6 @@ obj-y += lpc_ich9.o q35.o obj-$(CONFIG_XEN) += xen_platform.o xen_apic.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o -obj-y += kvm/ obj-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o obj-y += pc-testdev.o diff --git a/hw/kvm/Makefile.objs b/hw/kvm/Makefile.objs index f620d7f..2a157a6 100644 --- a/hw/kvm/Makefile.objs +++ b/hw/kvm/Makefile.objs @@ -1 +1,6 @@ -obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o +ifeq ($(TARGET_BASE_ARCH),i386) +TARGET_BASE_I386=y +endif + +obj-$(TARGET_BASE_I386) += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o +obj-$(TARGET_ARM) += arm_gic.o -- 1.7.10.4