diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-29 09:26:41 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-29 09:26:41 -0300 |
| commit | 0aafadc1967b477f6741823a01e34d2160c8153e (patch) | |
| tree | 9b1e1cc44a2ec1e139b907d3b581e37a7c450ce9 /Makefile.target | |
| parent | qemu-kvm: allocate correct size for dirty bitmap (diff) | |
| parent | Fix user targets broken by 96e132e24ee5a693069e83b6a981693588b088c1 (diff) | |
| download | qemu-kvm-0aafadc1967b477f6741823a01e34d2160c8153e.tar.gz qemu-kvm-0aafadc1967b477f6741823a01e34d2160c8153e.tar.bz2 qemu-kvm-0aafadc1967b477f6741823a01e34d2160c8153e.zip | |
Merge commit '52d946208e9cc2e958b4d3ad18914a51bdbe197a' into upstream-merge
* commit '52d946208e9cc2e958b4d3ad18914a51bdbe197a':
Fix user targets broken by 96e132e24ee5a693069e83b6a981693588b088c1
Conflicts:
Makefile.target
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.target b/Makefile.target index 609015bd8..3b990f9c7 100644 --- a/Makefile.target +++ b/Makefile.target @@ -93,7 +93,7 @@ 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/tcg-runtime.o +obj-$(CONFIG_CPU_EMULATION) += tcg-runtime.o obj-y += host-utils.o obj-$(TARGET_HAS_BFLT) += flatload.o @@ -129,7 +129,7 @@ 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/tcg-runtime.o host-utils.o +obj-y += tcg-runtime.o host-utils.o obj-i386-y += ioport-user.o @@ -148,7 +148,7 @@ 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/tcg-runtime.o host-utils.o +obj-y += tcg-runtime.o host-utils.o obj-i386-y += ioport-user.o |