diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-04-04 20:45:03 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-04-04 20:45:03 +0000 |
| commit | 8f8d364f2447e58768132fc10f48a67af371ee38 (patch) | |
| tree | 035d9c9a9dd7a4ae67e1ac25b39c4aa7f0c8b89c /Makefile.target | |
| parent | a7be9bad33d81d4bab2a51935b5443d258e7d082 (diff) | |
| parent | b8ba6799f41cccd1e81ec2986f2f80fc916ef86f (diff) | |
| download | qemu-8f8d364f2447e58768132fc10f48a67af371ee38.tar.gz | |
Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
* 's390-for-upstream' of git://repo.or.cz/qemu/agraf:
target-s390x: Update s390x_{tod,cpu}_timer() to use S390CPU
target-s390x: QOM'ify CPU init
target-s390x: QOM'ify CPU reset
target-s390x: QOM'ify CPU
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.target b/Makefile.target index cff15f0e13..999a968abe 100644 --- a/Makefile.target +++ b/Makefile.target @@ -93,6 +93,7 @@ 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_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_init.o |