summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikolaj Kucharski <mikolaj@kucharski.name>2009-12-26 23:41:51 +0000
committerMarcelo Tosatti <mtosatti@redhat.com>2009-12-27 16:24:26 -0200
commita4835504c15f5b2d6e42823d10e30d340417cfc8 (patch)
treec6bb95903799914786865dda941544dc5f4689cc
parentdummy kvm_save_mpstate for CONFIG_KVM=n (diff)
downloadqemu-kvm-a4835504c15f5b2d6e42823d10e30d340417cfc8.tar.gz
qemu-kvm-a4835504c15f5b2d6e42823d10e30d340417cfc8.tar.bz2
qemu-kvm-a4835504c15f5b2d6e42823d10e30d340417cfc8.zip
fix multiple definition of mulu64 and muls64 with user targets
After adding dummy kvm_save_mpstate change from git I would compile all softmmu targets as expected. Although I found another problem. I cannot compile some `user' targets. All of them failed with: ../libuser/libuser.a(host-utils.o): In function `mulu64': /home/users/build/rpmbuild/BUILD/qemu-kvm-0.12.1.1/host-utils.c:77: multiple definition of `mulu64' host-utils.o:/home/users/build/rpmbuild/BUILD/qemu-kvm-0.12.1.1/host-utils.c:77: first defined here ../libuser/libuser.a(host-utils.o): In function `muls64': /home/users/build/rpmbuild/BUILD/qemu-kvm-0.12.1.1/host-utils.c:87: multiple definition of `muls64' host-utils.o:/home/users/build/rpmbuild/BUILD/qemu-kvm-0.12.1.1/host-utils.c:87: first defined here Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--Makefile.target1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index b3a54ca18..6037fed49 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -101,7 +101,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
-obj-y += host-utils.o
obj-$(TARGET_HAS_BFLT) += flatload.o
obj-$(TARGET_HAS_ELFLOAD32) += elfload32.o