[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT 05d00df] Fix user emulator breakage
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT 05d00df] Fix user emulator breakage |
Date: |
Sun, 27 Sep 2009 13:58:45 -0000 |
From: Blue Swirl <address@hidden>
Fix breakage in the following conditions:
- use in-tree building
- build user targets after system targets
Signed-off-by: Blue Swirl <address@hidden>
diff --git a/Makefile.target b/Makefile.target
index a807f27..7e61e85 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -83,7 +83,6 @@ 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-y += tcg-runtime.o host-utils.o
obj-$(TARGET_HAS_BFLT) += flatload.o
obj-$(TARGET_HAS_ELFLOAD32) += elfload32.o
@@ -118,7 +117,6 @@ 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
@@ -137,7 +135,6 @@ 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
@@ -147,8 +144,9 @@ endif #CONFIG_BSD_USER
ifdef CONFIG_USER_ONLY
# hack to compile with -fpie for *-user targets
+obj-y += tcg-runtime-user.o host-utils-user.o
obj-y += cutils-user.o cache-utils-user.o
-cutils-user.c cache-utils-user.c:
+tcg-runtime-user.c host-utils-user.c cutils-user.c cache-utils-user.c:
@echo " LN $(TARGET_DIR)$@"
@ln -s $(SRC_PATH)/$(@:%-user.c=%.c) $@
endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT 05d00df] Fix user emulator breakage,
Anthony Liguori <=