diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-05-29 16:32:10 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-06-07 09:21:19 +0200 |
| commit | 25f27a4f7160d077d6992e811021b4bc3a82abc1 (patch) | |
| tree | 21e7e8741135e3b3dcdc13c74b059ce56a5c5e9e | |
| parent | fec90ff0bd522a65beb330ab5ca45a40b2f14f10 (diff) | |
build: compile oslib-obj-y once
There is no difference in oslib-obj-y between user-mode and system
targets. There used to be when user-mode could optionally be
compiled with PIE.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | Makefile.objs | 3 | ||||
| -rw-r--r-- | Makefile.target | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.objs b/Makefile.objs index 74110dda7e..8e72f097a6 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -22,6 +22,8 @@ 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 @@ -62,7 +64,6 @@ 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 2907aad0c4..2912307e52 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 $(oslib-obj-y) +obj-y += gdbstub.o thunk.o user-exec.o endif #CONFIG_LINUX_USER |