diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-29 09:44:53 -0300 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-29 09:44:53 -0300 |
commit | ee06eaf8553ec029e70d78e096e1c1e089cf51e2 (patch) | |
tree | 7b38a8fe6e49e4b4cfa47d105c8924945550dc30 /Makefile.target | |
parent | Merge commit 'ee3993069ff55fa6f1c64daf1e09963e340db8e4' into upstream-merge (diff) | |
parent | Compile some user files only once for all targets (diff) | |
download | qemu-kvm-ee06eaf8553ec029e70d78e096e1c1e089cf51e2.tar.gz qemu-kvm-ee06eaf8553ec029e70d78e096e1c1e089cf51e2.tar.bz2 qemu-kvm-ee06eaf8553ec029e70d78e096e1c1e089cf51e2.zip |
Merge commit 'add16157d72454347feb240007da4f90b9d9bae6' into upstream-merge
* commit 'add16157d72454347feb240007da4f90b9d9bae6':
Compile some user files only once for all targets
tcg/x86_64: generated dec/inc instead of sub/add when possible
Don't compile roms if not building system targets
Fix user emulator breakage
tcg/ppc: always use tcg_out_call
vl: Add failure check for SetEvent
vl: Do not use perror after failed Win32 API calls
Conflicts:
Makefile.target
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r-- | Makefile.target | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/Makefile.target b/Makefile.target index dc7e4197b..e991fa325 100644 --- a/Makefile.target +++ b/Makefile.target @@ -92,7 +92,6 @@ VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \ elfload.o linuxload.o uaccess.o gdbstub.o gdbstub-xml.o -obj-y += envlist.o path.o obj-$(CONFIG_CPU_EMULATION) += tcg-runtime.o obj-y += host-utils.o @@ -110,7 +109,8 @@ obj-arm-y += arm-semi.o obj-m68k-y += m68k-sim.o m68k-semi.o -ARLIBS=libqemu.a +ARLIBS=../libuser/libuser.a libqemu.a + endif #CONFIG_LINUX_USER ######################################################### @@ -128,12 +128,10 @@ LIBS+=-lmx obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \ gdbstub.o gdbstub-xml.o -obj-y += envlist.o path.o -obj-y += tcg-runtime.o host-utils.o obj-i386-y += ioport-user.o -ARLIBS=libqemu.a +ARLIBS=../libuser/libuser.a libqemu.a endif #CONFIG_DARWIN_USER @@ -147,24 +145,13 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH) obj-y = main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \ gdbstub.o gdbstub-xml.o uaccess.o -obj-y += envlist.o path.o -obj-y += tcg-runtime.o host-utils.o obj-i386-y += ioport-user.o -ARLIBS=libqemu.a +ARLIBS=../libuser/libuser.a libqemu.a endif #CONFIG_BSD_USER -ifdef CONFIG_USER_ONLY -# hack to compile with -fpie for *-user targets -obj-y += cutils-user.o cache-utils-user.o -cutils-user.c cache-utils-user.c: - @echo " LN $(TARGET_DIR)$@" - @ln -s $(SRC_PATH)/$(@:%-user.c=%.c) $@ -endif - - ######################################################### # System emulator target ifdef CONFIG_SOFTMMU |