3 files changed, 5 insertions, 26 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 722ad98..0f0773d 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-23  Mike Frysinger  <vapier@gentoo.org>
+
+	* cgen-trace.c [!__STDC__]: Delete.
+	* sim-trace.h [!__STDC__]: Likewise.
+
 2015-06-21  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-model.c (sim_model_init): Assert model is not NULL.
diff --git a/sim/common/cgen-trace.c b/sim/common/cgen-trace.c
index 566f2e6..f163a6e 100644
--- a/sim/common/cgen-trace.c
+++ b/sim/common/cgen-trace.c
@@ -302,18 +302,10 @@ cgen_trace_printf (SIM_CPU *cpu, char *fmt, ...)
 int
 sim_disasm_sprintf (SFILE *f, const char *format, ...)
 {
-#ifndef __STDC__
-  SFILE *f;
-  const char *format;
-#endif
   int n;
   va_list args;
 
   va_start (args, format);
-#ifndef __STDC__
-  f = va_arg (args, SFILE *);
-  format = va_arg (args, char *);
-#endif
   vsprintf (f->current, format, args);
   f->current += n = strlen (f->current);
   va_end (args);
diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c
index f00fe9b..f5ee678 100644
--- a/sim/common/sim-trace.c
+++ b/sim/common/sim-trace.c
@@ -1294,19 +1294,9 @@ trace_one_insn (SIM_DESC sd, sim_cpu *cpu, address_word pc,
 void
 trace_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
 {
-#if !defined __STDC__ && !defined ALMOST_STDC
-  SIM_DESC sd;
-  sim_cpu *cpu;
-  const char *fmt;
-#endif
   va_list ap;
 
   va_start (ap, fmt);
-#if !defined __STDC__ && !defined ALMOST_STDC
-  sd = va_arg (ap, SIM_DESC);
-  cpu = va_arg (ap, sim_cpu *);
-  fmt = va_arg (ap, const char *);
-#endif
 
   trace_vprintf (sd, cpu, fmt, ap);
 
@@ -1316,17 +1306,9 @@ trace_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
 void
 debug_printf (sim_cpu *cpu, const char *fmt, ...)
 {
-#if !defined __STDC__ && !defined ALMOST_STDC
-  sim_cpu *cpu;
-  const char *fmt;
-#endif
   va_list ap;
 
   va_start (ap, fmt);
-#if !defined __STDC__ && !defined ALMOST_STDC
-  cpu = va_arg (ap, sim_cpu *);
-  fmt = va_arg (ap, const char *);
-#endif
 
   if (CPU_DEBUG_FILE (cpu) == NULL)
     (* STATE_CALLBACK (CPU_STATE (cpu))->evprintf_filtered)