[Qemu-devel] [PATCH] tracetool.py: always pass --binary, --target-arch, --target-type

[Alon Levy]

Signed-off-by: Alon Levy <address@hidden>
---
 Makefile.objs |   25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index 8e56f48..0e33f4b 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -373,12 +373,25 @@ else
 trace.h: trace.h-timestamp
 endif
 trace.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
-       $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py 
--format=h --backend=$(TRACE_BACKEND) < $< > $@,"  GEN   trace.h")
+       $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py \
+               --format=h      \
+               --backend=$(TRACE_BACKEND) \
+               --binary=$(bindir)/$(QEMU_PROG) \
+               --target-arch=$(TARGET_ARCH) \
+               --target-type=$(TARGET_TYPE) \
+               --target-type=$(TARGET_TYPE) < $< > $@, \
+       "  GEN   trace.h")
        @cmp -s $@ trace.h || cp $@ trace.h
 
 trace.c: trace.c-timestamp
 trace.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
-       $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py 
--format=c --backend=$(TRACE_BACKEND) < $< > $@,"  GEN   trace.c")
+       $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py \
+               --format=c \
+               --backend=$(TRACE_BACKEND) \
+               --binary=$(bindir)/$(QEMU_PROG) \
+               --target-arch=$(TARGET_ARCH) \
+               --target-type=$(TARGET_TYPE) < $< > $@, \
+       "  GEN   trace.c")
        @cmp -s $@ trace.c || cp $@ trace.c
 
 trace.o: trace.c $(GENERATED_HEADERS)
@@ -391,7 +404,13 @@ trace-dtrace.h: trace-dtrace.dtrace
 # rule file. So we use '.dtrace' instead
 trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp
 trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events 
$(BUILD_DIR)/config-host.mak
-       $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py 
--format=d --backend=$(TRACE_BACKEND) < $< > $@,"  GEN   trace-dtrace.dtrace")
+       $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py \
+               --format=d \
+               --backend=$(TRACE_BACKEND) \
+               --binary=$(bindir)/$(QEMU_PROG) \
+               --target-arch=$(TARGET_ARCH) \
+               --target-type=$(TARGET_TYPE) < $< > $@, \
+       "  GEN   trace-dtrace.dtrace")
        @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace
 
 trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS)
-- 
1.7.9.3