sim: trace: rename debug_printf fully

Rather than redirect using a define, just rename the symbol fully.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 7a224bc02d3b7c4952b65966c4ee546303b4a16e..37f97dc4aea745e764bb4071a9453280927c3364 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,11 @@
+2015-06-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-trace.c (debug_printf): Rename to ...
+       (sim_debug_printf): ... this.
+       * sim-trace.h (debug_printf): Delete define.
+       (debug_printf): Rename to ...
+       (sim_debug_printf): ... this.
+
 2015-06-24  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-trace.c (OPTION_TRACE_REGISTER): New enum.

diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c
index 6e11cceb822523e8ca65ca6d151d7f86ce0cd4d1..40286e14f21ad93d7c7d558778f7685d9beafe18 100644 (file)
--- a/sim/common/sim-trace.c
+++ b/sim/common/sim-trace.c
@@ -1316,7 +1316,7 @@ trace_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
 }
 
 void
-debug_printf (sim_cpu *cpu, const char *fmt, ...)
+sim_debug_printf (sim_cpu *cpu, const char *fmt, ...)
 {
   va_list ap;
 

diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index 54a282407c96805398796b1bbd62a6b3de4d2a20..580cd4e1f98469e7b596c39084004e423b857649 100644 (file)
--- a/sim/common/sim-trace.h
+++ b/sim/common/sim-trace.h
@@ -648,10 +648,7 @@ extern void trace_vprintf (SIM_DESC, sim_cpu *, const char *, va_list);
 /* Non-zero if "--debug-insn" specified.  */
 #define DEBUG_INSN_P(cpu) DEBUG_P (cpu, DEBUG_INSN_IDX)
 
-/* GDB also has a debug_printf, so we shadow ours.  */
-#define debug_printf sim_debug_printf
-
-extern void debug_printf (sim_cpu *, const char *, ...)
+extern void sim_debug_printf (sim_cpu *, const char *, ...)
      __attribute__((format (printf, 2, 3)));
 
 #endif /* SIM_TRACE_H */