[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/19] TARGET_ARCH == TARGET_BASE_ARCH in m68k and a
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 15/19] TARGET_ARCH == TARGET_BASE_ARCH in m68k and arm |
Date: |
Thu, 2 Jul 2009 16:46:39 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile.target | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 7dc7a0b..33f817d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -287,23 +287,22 @@ obj-$(TARGET_HAS_ELFLOAD32) += elfload32.o
ifeq ($(TARGET_ARCH), i386)
obj-y += vm86.o
endif
-ifeq ($(TARGET_ARCH), arm)
+
nwfpe-obj-y := fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o
nwfpe-obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o
-obj-y += $(addprefix nwfpe/, $(nwfpe-obj-y))
-obj-y += arm-semi.o
-endif
-ifeq ($(TARGET_ARCH), m68k)
-obj-y += m68k-sim.o m68k-semi.o
-endif
+obj-arm-y += $(addprefix nwfpe/, $(nwfpe-obj-y))
+obj-arm-y += arm-semi.o
+
+obj-m68k-y += m68k-sim.o m68k-semi.o
# Note: this is a workaround. The real fix is to avoid compiling
# cpu_signal_handler() in cpu-exec.c.
signal.o: CFLAGS += $(HELPER_CFLAGS)
$(QEMU_PROG): ARLIBS=../libqemu_user.a libqemu.a
-$(QEMU_PROG): $(obj-y) ../libqemu_user.a libqemu.a
- $(call LINK,$(obj-y))
+$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) ../libqemu_user.a
libqemu.a
+ $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
+
ifeq ($(ARCH),alpha)
# Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of
# the address space (31 bit so sign extending doesn't matter)
--
1.6.2.2
- [Qemu-devel] [PATCH 09/19] TARGET_ARCH2 is already known at configure time and it is called target_cpu Remove re-construction in Makefile.target, (continued)
- [Qemu-devel] [PATCH 09/19] TARGET_ARCH2 is already known at configure time and it is called target_cpu Remove re-construction in Makefile.target, quintela, 2009/07/02
- [Qemu-devel] [PATCH 12/19] configure kvm in a single place, quintela, 2009/07/02
- [Qemu-devel] [PATCH 06/19] Remove unused Makefile variable, quintela, 2009/07/02
- [Qemu-devel] [PATCH 10/19] chang ifdefs by obj-, quintela, 2009/07/02
- [Qemu-devel] [PATCH 11/19] configure xen in a single place, quintela, 2009/07/02
- [Qemu-devel] [PATCH 14/19] BASE_LDFLAGS is not used anywhere else, quintela, 2009/07/02
- [Qemu-devel] [PATCH 13/19] configure kqemu in a single place, quintela, 2009/07/02
- [Qemu-devel] [PATCH 15/19] TARGET_ARCH == TARGET_BASE_ARCH in m68k and arm,
quintela <=
- [Qemu-devel] [PATCH 17/19] qemu binary don't exist anymore. I guess not much people is compiling on alpha, quintela, 2009/07/02
- [Qemu-devel] [PATCH 16/19] Refactor a single rule to generate all qemu-* executables, quintela, 2009/07/02
- [Qemu-devel] [PATCH 18/19] We can wrap OS_CFLAGS/OS_LDFLAGS in CFLAGS/LDFLAGS at configure time, quintela, 2009/07/02
- [Qemu-devel] [PATCH 19/19] We can wrap ARCH_CFLAGS/ARCH_LDFLAGS in CFLAGS/LDFLAGS at configure time, quintela, 2009/07/02