gwj / at91sam9263 · Commits

Commit 1c8726725896c4457c03b2858e0525008bb42032

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent c44098ca

TARGET_ARCH == TARGET_BASE_ARCH in m68k and arm 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 1 changed file with 8 additions and 9 deletions
Makefile.target
  View file @1c87267
@@ -288,23 +288,22 @@ obj-$(TARGET_HAS_ELFLOAD32) += elfload32.o @@ -288,23 +288,22 @@ obj-$(TARGET_HAS_ELFLOAD32) += elfload32.o
288 ifeq ($(TARGET_ARCH), i386) 288 ifeq ($(TARGET_ARCH), i386)
289 obj-y += vm86.o 289 obj-y += vm86.o
290 endif 290 endif
291 -ifeq ($(TARGET_ARCH), arm) 291 +
292 nwfpe-obj-y := fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o 292 nwfpe-obj-y := fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o
293 nwfpe-obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o 293 nwfpe-obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o
294 -obj-y += $(addprefix nwfpe/, $(nwfpe-obj-y))  
295 -obj-y += arm-semi.o  
296 -endif  
297 -ifeq ($(TARGET_ARCH), m68k)  
298 -obj-y += m68k-sim.o m68k-semi.o  
299 -endif 294 +obj-arm-y += $(addprefix nwfpe/, $(nwfpe-obj-y))
  295 +obj-arm-y += arm-semi.o
  296 +
  297 +obj-m68k-y += m68k-sim.o m68k-semi.o
300 298
301 # Note: this is a workaround. The real fix is to avoid compiling 299 # Note: this is a workaround. The real fix is to avoid compiling
302 # cpu_signal_handler() in cpu-exec.c. 300 # cpu_signal_handler() in cpu-exec.c.
303 signal.o: CFLAGS += $(HELPER_CFLAGS) 301 signal.o: CFLAGS += $(HELPER_CFLAGS)
304 302
305 $(QEMU_PROG): ARLIBS=../libqemu_user.a libqemu.a 303 $(QEMU_PROG): ARLIBS=../libqemu_user.a libqemu.a
306 -$(QEMU_PROG): $(obj-y) ../libqemu_user.a libqemu.a  
307 - $(call LINK,$(obj-y)) 304 +$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) ../libqemu_user.a libqemu.a
  305 + $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
  306 +
308 ifeq ($(ARCH),alpha) 307 ifeq ($(ARCH),alpha)
309 # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of 308 # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of
310 # the address space (31 bit so sign extending doesn't matter) 309 # the address space (31 bit so sign extending doesn't matter)