[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 24/25] build: compile oslib-obj-y once
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 24/25] build: compile oslib-obj-y once |
Date: |
Wed, 6 Jun 2012 08:36:31 +0200 |
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 <address@hidden>
---
Makefile.objs | 3 ++-
Makefile.target | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 74110dd..8e72f09 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 cfbd265..1b4ac98 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
--
1.7.10.1
- [Qemu-devel] [PATCH v2 00/25] per-directory Makefile.objs snippets, limit vpath (ab)use, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 01/25] build: remove trace-nested-y, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 23/25] build: limit usage of vpath, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 24/25] build: compile oslib-obj-y once,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 22/25] build: libcacard Makefile cleanups, Paolo Bonzini, 2012/06/06
- [Qemu-devel] [PATCH v2 25/25] build: do not create directories at configure time, Paolo Bonzini, 2012/06/06
- Re: [Qemu-devel] [PATCH v2 25/25] build: do not create directories at configure time, Anthony Liguori, 2012/06/06
- Re: [Qemu-devel] [PATCH v2 25/25] build: do not create directories at configure time, Paolo Bonzini, 2012/06/06
- Re: [Qemu-devel] [PATCH v2 25/25] build: do not create directories at configure time, Peter Maydell, 2012/06/06
- Re: [Qemu-devel] [PATCH v2 25/25] build: do not create directories at configure time, Paolo Bonzini, 2012/06/06
- Re: [Qemu-devel] [PATCH v2 25/25] build: do not create directories at configure time, Anthony Liguori, 2012/06/06
- Re: [Qemu-devel] [PATCH v2 25/25] build: do not create directories at configure time, Eric Blake, 2012/06/06
- Re: [Qemu-devel] [PATCH v2 25/25] build: do not create directories at configure time, Anthony Liguori, 2012/06/06
- Re: [Qemu-devel] [PATCH v2 25/25] build: do not create directories at configure time, Paolo Bonzini, 2012/06/07