4 files changed, 11 insertions, 5 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog
index 04e5202f581..71d9db92246 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,5 +1,11 @@
 2014-01-06  Tom Tromey  <tromey@redhat.com>
 
+	* common/cgen-trace.c: Don't use old VA_* macros.
+	* common/sim-load.c (xprintf): Likewise.
+	* common/sim-trace.c (trace_printf, debug_printf): Likewise.
+
+2014-01-06  Tom Tromey  <tromey@redhat.com>
+
 	* README-HACKING: Don't use PARAMS.
 	* arm/wrapper.c: Don't use PARAMS.
 	* bfin/sim-main.h: Don't use PARAMS.
diff --git a/sim/common/cgen-trace.c b/sim/common/cgen-trace.c
index 6e2f85605b5..ed9aee1e2ea 100644
--- a/sim/common/cgen-trace.c
+++ b/sim/common/cgen-trace.c
@@ -308,7 +308,7 @@ sim_disasm_sprintf (SFILE *f, const char *format, ...)
   int n;
   va_list args;
 
-  VA_START (args, format);
+  va_start (args, format);
 #ifndef __STDC__
   f = va_arg (args, SFILE *);
   format = va_arg (args, char *);
diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c
index 2e2b804bf63..48c0a93169f 100644
--- a/sim/common/sim-load.c
+++ b/sim/common/sim-load.c
@@ -173,7 +173,7 @@ xprintf (host_callback *callback, const char *fmt, ...)
 {
   va_list ap;
 
-  VA_START (ap, fmt);
+  va_start (ap, fmt);
 
   (*callback->vprintf_filtered) (callback, fmt, ap);
 
@@ -185,7 +185,7 @@ eprintf (host_callback *callback, const char *fmt, ...)
 {
   va_list ap;
 
-  VA_START (ap, fmt);
+  va_start (ap, fmt);
 
   (*callback->evprintf_filtered) (callback, fmt, ap);
 
diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c
index bb56db7acf5..b8cfff34fc7 100644
--- a/sim/common/sim-trace.c
+++ b/sim/common/sim-trace.c
@@ -1309,7 +1309,7 @@ trace_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
 #endif
   va_list ap;
 
-  VA_START (ap, fmt);
+  va_start (ap, fmt);
 #if !defined __STDC__ && !defined ALMOST_STDC
   sd = va_arg (ap, SIM_DESC);
   cpu = va_arg (ap, sim_cpu *);
@@ -1330,7 +1330,7 @@ debug_printf (sim_cpu *cpu, const char *fmt, ...)
 #endif
   va_list ap;
 
-  VA_START (ap, fmt);
+  va_start (ap, fmt);
 #if !defined __STDC__ && !defined ALMOST_STDC
   cpu = va_arg (ap, sim_cpu *);
   fmt = va_arg (ap, const char *);