[Qemu-devel] [PATCH] only link current target arch traces to qemu-system

[Xu, Anthony]

When building target x86_64-softmmu, all other architectures' trace.o are 
linked into 
x86_64-softmmu/qemu-system-x86_64, like hw/arm/trace.o, hw/mips/trace.o etc., 
that is not necessary.
 Same thing happens when building other targets.

Only current target arch traces should be linked into qemu-system.

Signed-off -by: Anthony Xu <address@hidden>




diff --git a/Makefile.target b/Makefile.target
index 7df2b8c..638e044 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -177,6 +177,41 @@ block-obj-y :=
 common-obj-y :=
 chardev-obj-y :=
 include $(SRC_PATH)/Makefile.objs
+
+# remove all arch related trace
+trace-obj-y := $(filter-out hw/alpha/trace.o 
hw/alpha/trace-dtrace.o,$(trace-obj-y))
+trace-obj-y := $(filter-out target/alpha/trace.o 
target/alpha/trace-dtrace.o,$(trace-obj-y))
+
+trace-obj-y := $(filter-out hw/arm/trace.o 
hw/arm/trace-dtrace.o,$(trace-obj-y))
+trace-obj-y := $(filter-out target/arm/trace.o 
target/arm/trace-dtrace.o,$(trace-obj-y))
+
+trace-obj-y := $(filter-out hw/i386/trace.o 
hw/i386/trace-dtrace.o,$(trace-obj-y))
+trace-obj-y := $(filter-out target/i386/trace.o 
target/i386/trace-dtrace.o,$(trace-obj-y))
+
+trace-obj-y := $(filter-out hw/mips/trace.o 
hw/mips/trace-dtrace.o,$(trace-obj-y))
+trace-obj-y := $(filter-out target/mips/trace.o 
target/mips/trace-dtrace.o,$(trace-obj-y))
+
+trace-obj-y := $(filter-out hw/sparc/trace.o 
hw/sparc/trace-dtrace.o,$(trace-obj-y))
+trace-obj-y := $(filter-out target/sparc/trace.o 
target/sparc/trace-dtrace.o,$(trace-obj-y))
+
+trace-obj-y := $(filter-out hw/s390x/trace.o 
hw/s390x/trace-dtrace.o,$(trace-obj-y))
+trace-obj-y := $(filter-out target/s390x/trace.o 
target/s390x/trace-dtrace.o,$(trace-obj-y))
+
+trace-obj-y := $(filter-out hw/ppc/trace.o 
hw/ppc/trace-dtrace.o,$(trace-obj-y))
+trace-obj-y := $(filter-out target/ppc/trace.o 
target/ppc/trace-dtrace.o,$(trace-obj-y))
+
+# add current arch related trace
+carch := $(TARGET_BASE_ARCH)
+ifneq ($(wildcard $(SRC_PATH)/hw/$(carch)/trace-events),)
+trace-obj-y += hw/$(carch)/trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += hw/$(carch)/trace-dtrace.o
+endif
+
+ifneq ($(wildcard $(SRC_PATH)/target/$(carch)/trace-events),)
+trace-obj-y += target/$(carch)/trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += target/$(carch)/trace-dtrace.o
+endif
+
 dummy := $(call unnest-vars,,target-obj-y)
 target-obj-y-save := $(target-obj-y)
 dummy := $(call unnest-vars,.., \