From 79eb76ade2ec09c7209662323650be41988ddb51 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Fri, 22 May 2009 09:23:45 -0500 Subject: [PATCH] Revert "Fix arm-softmmu breakage" 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 --- Makefile.target | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)) -- 2.7.4