From a51715734ac5cfa0aa7d2c039b89e557e68fc42a Mon Sep 17 00:00:00 2001 From: chenhuitao Date: Sun, 7 Jun 2020 04:25:07 +0800 Subject: [PATCH] update PPC objs. only build libdecnumber while PPC is enabled. --- Makefile | 12 +++--------- qemu/Makefile.objs | 1 - qemu/target-ppc/Makefile.objs | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 31dcbcee..7f13c653 100644 --- a/Makefile +++ b/Makefile @@ -74,15 +74,9 @@ UC_TARGET_OBJ_SPARC64 = $(call UC_GET_OBJ,obj-,qemu/Makefile.target, qemu/sparc6 UC_TARGET_OBJ_SPARC64 += $(call UC_GET_OBJ,obj-y,qemu/target-sparc/Makefile.objs, qemu/sparc64-softmmu/target-sparc/) UC_TARGET_OBJ_SPARC64 += $(call UC_GET_OBJ,obj-$$(TARGET_SPARC64),qemu/target-sparc/Makefile.objs, qemu/sparc64-softmmu/target-sparc/) - -UC_TARGET_OBJ_PPC = qemu/ppc-softmmu/exec.o qemu/ppc-softmmu/target-ppc/timebase_helper.o qemu/ppc-softmmu/target-ppc/translate.o -UC_TARGET_OBJ_PPC += qemu/ppc-softmmu/target-ppc/fpu_helper.o qemu/ppc-softmmu/target-ppc/unicorn.o qemu/ppc-softmmu/target-ppc/int_helper.o -UC_TARGET_OBJ_PPC += qemu/ppc-softmmu/target-ppc/excp_helper.o qemu/ppc-softmmu/target-ppc/mem_helper.o qemu/ppc-softmmu/target-ppc/mmu_helper.o -UC_TARGET_OBJ_PPC += qemu/ppc-softmmu/target-ppc/cpu-models.o qemu/ppc-softmmu/target-ppc/misc_helper.o qemu/ppc-softmmu/target-ppc/mmu-hash32.o -UC_TARGET_OBJ_PPC += qemu/ppc-softmmu/target-ppc/dfp_helper.o qemu/ppc-softmmu/hw/ppc/ppc.o qemu/ppc-softmmu/hw/ppc/ppc_booke.o -UC_TARGET_OBJ_PPC += qemu/ppc-softmmu/cpus.o qemu/ppc-softmmu/fpu/softfloat.o qemu/ppc-softmmu/tcg/optimize.o -UC_TARGET_OBJ_PPC += qemu/ppc-softmmu/tcg/tcg.o qemu/ppc-softmmu/ioport.o qemu/ppc-softmmu/memory_mapping.o qemu/ppc-softmmu/memory.o -UC_TARGET_OBJ_PPC += qemu/ppc-softmmu/cpu-exec.o qemu/ppc-softmmu/cputlb.o qemu/ppc-softmmu/translate-all.o +UC_TARGET_OBJ_PPC = $(call UC_GET_OBJ,obj-,qemu/Makefile.target, qemu/ppc-softmmu/) +UC_TARGET_OBJ_PPC += $(call UC_GET_OBJ,obj-,qemu/hw/ppc/Makefile.objs, qemu/ppc-softmmu/hw/ppc/) +UC_TARGET_OBJ_PPC += $(call UC_GET_OBJ,obj-y,qemu/target-ppc/Makefile.objs, qemu/ppc-softmmu/target-ppc/) ifneq (,$(findstring x86,$(UNICORN_ARCHS))) UC_TARGET_OBJ += $(UC_TARGET_OBJ_X86) diff --git a/qemu/Makefile.objs b/qemu/Makefile.objs index c62943b0..89532719 100644 --- a/qemu/Makefile.objs +++ b/qemu/Makefile.objs @@ -9,5 +9,4 @@ common-obj-y += qemu-log.o common-obj-y += tcg-runtime.o common-obj-y += hw/ common-obj-y += qom/ -common-obj-y += libdecnumber/decContext.o libdecnumber/decNumber.o libdecnumber/dpd/decimal32.o libdecnumber/dpd/decimal64.o libdecnumber/dpd/decimal128.o diff --git a/qemu/target-ppc/Makefile.objs b/qemu/target-ppc/Makefile.objs index a41c7177..dc868a90 100644 --- a/qemu/target-ppc/Makefile.objs +++ b/qemu/target-ppc/Makefile.objs @@ -10,4 +10,4 @@ obj-y += misc_helper.o obj-y += mem_helper.o obj-y += translate.o obj-y += unicorn.o - +obj-y += ../libdecnumber/decContext.o ../libdecnumber/decNumber.o ../libdecnumber/dpd/decimal32.o ../libdecnumber/dpd/decimal64.o ../libdecnumber/dpd/decimal128.o