[Qemu-commits] [COMMIT 79eb76a] Revert "Fix arm-softmmu breakage"

[Anthony Liguori]

From: Anthony Liguori <address@hidden>

This reverts commit ec6bd8dea77478f32981a5df49f66ca2430ad19d.

This broke any target that uses virtio.  Virtio devices live in libhw and
without whole-archive, the constructors will never be called for virtio.

Signed-off-by: Anthony Liguori <address@hidden>

diff --git a/Makefile.target b/Makefile.target
index 959765e..4de29f8 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -709,8 +709,8 @@ endif
 
 vl.o: qemu-options.h
 
-$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) 
$(VDE_LIBS) libqemu.a $(HWLIB)
-$(QEMU_PROG): ARLIBS=../libqemu_common.a
+$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) 
$(VDE_LIBS)
+$(QEMU_PROG): ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a $(HWLIB)
        $(call LINK,$(OBJS))