Commit 1c872672 authored by Juan Quintela's avatar Juan Quintela Committed by Anthony Liguori

TARGET_ARCH == TARGET_BASE_ARCH in m68k and arm

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent c44098ca
......@@ -288,23 +288,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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment