Merge remote-tracking branch 'stefanha/block' into staging

[qemu.git] / target-arm / Makefile.objs

diff --git a/target-arm/Makefile.objs b/target-arm/Makefile.objs
index f447c4fdf2d646028def1738eb41a2f73a2f14fa..2d9f77fa9b425796f948ade7aec25d333e513cae 100644 (file)
--- a/target-arm/Makefile.objs
+++ b/target-arm/Makefile.objs
@@ -1,6 +1,7 @@
 obj-y += arm-semi.o
 obj-$(CONFIG_SOFTMMU) += machine.o
+obj-$(CONFIG_KVM) += kvm.o
+obj-$(CONFIG_NO_KVM) += kvm-stub.o
 obj-y += translate.o op_helper.o helper.o cpu.o
 obj-y += neon_helper.o iwmmxt_helper.o
-
-$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
+obj-y += gdbstub.o