diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2012-05-01 09:27:53 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2012-05-01 09:27:53 +0000 |
commit | 61d25e1548b5e5ec8b670e72e82a2a7b909f9d52 (patch) | |
tree | 6cfa2f23703fe891504e71ac4349de227e7ff746 /Makefile.target | |
parent | 42fe1c245f0239ebcdc084740a1777ac3699d071 (diff) | |
parent | 894a84e632e4e71eaa3588d7ca9854bf4d9027ea (diff) | |
download | qemu-61d25e1548b5e5ec8b670e72e82a2a7b909f9d52.zip qemu-61d25e1548b5e5ec8b670e72e82a2a7b909f9d52.tar.gz qemu-61d25e1548b5e5ec8b670e72e82a2a7b909f9d52.tar.bz2 |
Merge branch 'qom-cpu-rest.v1' of git://github.com/afaerber/qemu-cpu
* 'qom-cpu-rest.v1' of git://github.com/afaerber/qemu-cpu:
Makefile: Simplify compilation of target-*/cpu.c
target-mips: Start QOM'ifying CPU init
target-mips: QOM'ify CPU
target-m68k: Add QOM CPU subclasses
target-m68k: Start QOM'ifying CPU init
target-m68k: QOM'ify CPU reset
target-m68k: QOM'ify CPU
target-sh4: Start QOM'ifying CPU init
target-sh4: QOM'ify CPU reset
target-sh4: QOM'ify CPU
MAINTAINERS: Downgrade target-mips and target-sh4 to Odd Fixes
MAINTAINERS: Downgrade target-m68k to Odd Fixes
Diffstat (limited to 'Makefile.target')
-rw-r--r-- | Makefile.target | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Makefile.target b/Makefile.target index 1cf6943..af1cdbc 100644 --- a/Makefile.target +++ b/Makefile.target @@ -87,27 +87,18 @@ libobj-y += op_helper.o endif endif libobj-y += helper.o -ifeq ($(TARGET_BASE_ARCH), i386) +ifneq ($(TARGET_BASE_ARCH), ppc) libobj-y += cpu.o endif libobj-$(TARGET_SPARC64) += vis_helper.o libobj-$(CONFIG_NEED_MMU) += mmu.o libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o -libobj-$(TARGET_ARM) += cpu.o -libobj-$(TARGET_CRIS) += cpu.o -libobj-$(TARGET_LM32) += cpu.o -libobj-$(TARGET_MICROBLAZE) += cpu.o -libobj-$(TARGET_S390X) += cpu.o ifeq ($(TARGET_BASE_ARCH), sparc) libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o -libobj-y += cpu.o endif libobj-$(TARGET_SPARC) += int32_helper.o libobj-$(TARGET_SPARC64) += int64_helper.o -libobj-$(TARGET_UNICORE32) += cpu.o -libobj-$(TARGET_XTENSA) += cpu.o libobj-$(TARGET_ALPHA) += int_helper.o fpu_helper.o sys_helper.o mem_helper.o -libobj-$(TARGET_ALPHA) += cpu.o libobj-y += disas.o libobj-$(CONFIG_TCI_DIS) += tci-dis.o |