Commit 25f27a4f authored May 29, 2012 by Paolo Bonzini

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>

parent fec90ff0

Makefile.objs

+2 −1

Original line number	Diff line number	Diff line
		@@ -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

Makefile.target

+1 −1

Original line number	Diff line number	Diff line
		@@ -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