@@ -157,7 +157,7 @@ trace-events-subdirs += audio
trace-events-subdirs += net
trace-events-subdirs += target/arm
trace-events-subdirs += target/i386
-trace-events-y += target/sparc/trace-events
+trace-events-subdirs += target/sparc
trace-events-y += target/s390x/trace-events
trace-events-y += target/ppc/trace-events
trace-events-y += qom/trace-events
@@ -5,3 +5,5 @@ obj-$(TARGET_SPARC) += int32_helper.o
obj-$(TARGET_SPARC64) += int64_helper.o
obj-$(TARGET_SPARC64) += vis_helper.o
obj-y += gdbstub.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
@@ -19,7 +19,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "trace.h"
+#include "target/sparc/trace.h"
#include "sysemu/sysemu.h"
#include "exec/log.h"
@@ -21,7 +21,7 @@
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/log.h"
-#include "trace.h"
+#include "target/sparc/trace.h"
#define DEBUG_PCALL
@@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "trace.h"
+#include "target/sparc/trace.h"
#include "exec/address-spaces.h"
/* Sparc MMU emulation */
@@ -21,7 +21,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/helper-proto.h"
-#include "trace.h"
+#include "target/sparc/trace.h"
static inline void memcpy32(target_ulong *dst, const target_ulong *src)
{
Switch files in the target/sparc/ directory to include the target/sparc/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- Makefile.objs | 2 +- target/sparc/Makefile.objs | 2 ++ target/sparc/int32_helper.c | 2 +- target/sparc/int64_helper.c | 2 +- target/sparc/mmu_helper.c | 2 +- target/sparc/win_helper.c | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-)