sim: namespace sim_machs

[deliverable/binutils-gdb.git] / sim / common / sim-trace.h

diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index e96e68479565a58f19016e9e3ed11575b2d54464..c89084e94401f4589f00412446e52aeec23ee6a9 100644 (file)
--- a/sim/common/sim-trace.h
+++ b/sim/common/sim-trace.h
@@ -333,8 +333,7 @@ extern void trace_prefix (SIM_DESC sd,
                          const char *file_name,
                          int line_nr,
                          const char *fmt,
-                         ...)
-       __attribute__((format (printf, 8, 9)));
+                         ...) ATTRIBUTE_PRINTF (8, 9);
 
 /* Generic trace print, assumes trace_prefix() has been called */
 
@@ -342,8 +341,7 @@ extern void trace_generic (SIM_DESC sd,
                           sim_cpu *cpu,
                           int trace_idx,
                           const char *fmt,
-                          ...)
-     __attribute__((format (printf, 4, 5)));
+                          ...) ATTRIBUTE_PRINTF (4, 5);
 
 /* Disassemble the specified address.  */
 
@@ -655,9 +653,10 @@ do { \
 
 \f
 extern void trace_printf (SIM_DESC, sim_cpu *, const char *, ...)
-     __attribute__((format (printf, 3, 4)));
+    ATTRIBUTE_PRINTF (3, 4);
 
-extern void trace_vprintf (SIM_DESC, sim_cpu *, const char *, va_list);
+extern void trace_vprintf (SIM_DESC, sim_cpu *, const char *, va_list)
+    ATTRIBUTE_PRINTF (3, 0);
 
 /* Debug support.
    This is included here because there isn't enough of it to justify
@@ -676,6 +675,6 @@ int trace_load_symbols (SIM_DESC);
 bfd_vma trace_sym_value (SIM_DESC, const char *name);
 
 extern void sim_debug_printf (sim_cpu *, const char *, ...)
-     __attribute__((format (printf, 2, 3)));
+    ATTRIBUTE_PRINTF (2, 3);
 
 #endif /* SIM_TRACE_H */