From dbaf26b3b22daae3be6a89b965e43503e7c3b912 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 10 Jun 2012 20:29:19 +0000 Subject: Revert "build: compile oslib-obj-y once" This reverts commit 25f27a4f7160d077d6992e811021b4bc3a82abc1 because of bsd-user breakage. Signed-off-by: Blue Swirl --- Makefile.objs | 3 +-- Makefile.target | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 8e72f09..74110dd 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -22,8 +22,6 @@ oslib-obj-y = osdep.o oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o -universal-obj-y += $(oslib-obj-y) - ####################################################################### # coroutines coroutine-obj-y = qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o @@ -64,6 +62,7 @@ common-obj-y = $(block-obj-y) blockdev.o common-obj-y += net.o net/ common-obj-y += qom/ common-obj-y += readline.o console.o cursor.o +common-obj-y += $(oslib-obj-y) common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o diff --git a/Makefile.target b/Makefile.target index 2912307..2907aad 100644 --- a/Makefile.target +++ b/Makefile.target @@ -96,7 +96,7 @@ ifdef CONFIG_LINUX_USER QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user obj-y += linux-user/ -obj-y += gdbstub.o thunk.o user-exec.o +obj-y += gdbstub.o thunk.o user-exec.o $(oslib-obj-y) endif #CONFIG_LINUX_USER -- cgit v1.1