[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/24] compile oslib-obj-y once
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 24/24] compile oslib-obj-y once |
Date: |
Sun, 3 Jun 2012 14:25:58 +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 b91d4f4..797c440 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
@@ -63,7 +65,6 @@ common-obj-y += net.o net/
common-obj-y += qom/
common-obj-$(CONFIG_LINUX) += fsdev/
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 78147c3..98b4054 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -101,7 +101,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 13/24] move ui/ objects to nested Makefile, (continued)
- [Qemu-devel] [PATCH 13/24] move ui/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 14/24] move audio/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 15/24] move slirp/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 18/24] move target-independent hw/ objects to nested Makefiles, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 19/24] convert libhw to nested Makefiles, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 20/24] move per-target hw/ objects to nested Makefiles, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 17/24] move qga/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 24/24] compile oslib-obj-y once,
Paolo Bonzini <=
- Re: [Qemu-devel] [PATCH 00/24] per-directory Makefile snippets, limit vpath abuse, Blue Swirl, 2012/06/03
- [Qemu-devel] [PATCH 16/24] move qapi/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 22/24] libcacard Makefile cleanups, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 23/24] limit usage of vpath, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 21/24] move device tree to per-target Makefile, Paolo Bonzini, 2012/06/03
- Re: [Qemu-devel] [PATCH 00/24] per-directory Makefile snippets, limit vpath abuse, Andreas Färber, 2012/06/03