From 69ff2dac7a3adb26dbe1ee56cdf369513bdcf906 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 15 Jun 2021 20:46:10 -0400 Subject: [PATCH] sim: ppc: use common ATTRIBUTE_PRINTF macros Use the common ansidecl.h macros to replace our ad-hoc printf attributes. --- sim/ppc/ChangeLog | 15 +++++++++++++++ sim/ppc/cpu.h | 3 ++- sim/ppc/device.h | 2 +- sim/ppc/lf.h | 4 +++- sim/ppc/sim_callbacks.h | 2 +- sim/ppc/tree.h | 2 +- 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 6456dde8e1a..fd3a0c81eca 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,18 @@ +2021-06-16 Mike Frysinger + + * cpu.h: Include ansidecl.h. + (cpu_error): Change __attribute__ ((format (printf... to + ATTRIBUTE_PRINTF_3. + * device.h (device_error): Change __attribute__ ((format (printf... + to ATTRIBUTE_PRINTF_2. + * lf.h: Include ansidecl.h. + (lf_printf): Change __attribute__ ((format (printf... to + ATTRIBUTE_PRINTF_2. + * sim_callbacks.h (sim_io_printf_filtered): Change __attribute__ + ((format (printf... to ATTRIBUTE_PRINTF_1. + * tree.h (tree_parse): Change __attribute__ ((format (printf... to + ATTRIBUTE_PRINTF_2. + 2021-06-16 Mike Frysinger * double.c: Include ansidecls.h. diff --git a/sim/ppc/cpu.h b/sim/ppc/cpu.h index bafb5e1791a..7dc6074b9c6 100644 --- a/sim/ppc/cpu.h +++ b/sim/ppc/cpu.h @@ -34,6 +34,7 @@ #include "os_emul.h" #include "mon.h" #include "model.h" +#include "ansidecl.h" #include "libiberty.h" #ifndef CONST_ATTRIBUTE @@ -113,7 +114,7 @@ EXTERN_CPU\ (cpu *processor, unsigned_word cia, const char *fmt, - ...) __attribute__ ((format (printf, 3, 4))); + ...) ATTRIBUTE_PRINTF_3; /* The processors local concept of time */ diff --git a/sim/ppc/device.h b/sim/ppc/device.h index 1bc000876ee..68a2d24dd8d 100644 --- a/sim/ppc/device.h +++ b/sim/ppc/device.h @@ -729,7 +729,7 @@ EXTERN_DEVICE\ (void) device_error (device *me, const char *fmt, - ...) __attribute__ ((format (printf, 2, 3))); + ...) ATTRIBUTE_PRINTF_2; INLINE_DEVICE\ (int) device_trace diff --git a/sim/ppc/lf.h b/sim/ppc/lf.h index ce0b8763bba..fabf8fbc58a 100644 --- a/sim/ppc/lf.h +++ b/sim/ppc/lf.h @@ -20,6 +20,8 @@ /* LF: Line Numbered Output Stream */ +#include "ansidecl.h" + typedef struct _lf lf; typedef enum { @@ -72,7 +74,7 @@ extern int lf_putbin extern int lf_printf (lf *file, const char *fmt, - ...) __attribute__((format(printf, 2, 3))); + ...) ATTRIBUTE_PRINTF_2; /* Indentation control. diff --git a/sim/ppc/sim_callbacks.h b/sim/ppc/sim_callbacks.h index e4d9c70bb01..2b5f2a24c7b 100644 --- a/sim/ppc/sim_callbacks.h +++ b/sim/ppc/sim_callbacks.h @@ -29,7 +29,7 @@ #define printf_filtered sim_io_printf_filtered void sim_io_printf_filtered -(const char *msg, ...) __attribute__ ((format (printf, 1, 2))); +(const char *msg, ...) ATTRIBUTE_PRINTF_1; void ATTRIBUTE_NORETURN error (const char *msg, ...); diff --git a/sim/ppc/tree.h b/sim/ppc/tree.h index 165612cb8ec..6e278d9d145 100644 --- a/sim/ppc/tree.h +++ b/sim/ppc/tree.h @@ -48,7 +48,7 @@ EXTERN_TREE\ (device *) tree_parse (device *root, const char *fmt, - ...) __attribute__ ((format (printf, 2, 3))); + ...) ATTRIBUTE_PRINTF_2; INLINE_TREE\ -- 2.30.2