From 44d100c3b90473c1995acaf74ee3a424aedb9701 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 1 Jul 2013 19:50:11 +0000 Subject: [PATCH] add -Wold-style-declaration This adds -Wold-style-declaration to gdb's list of warnings. It turns out that a few places use "const static" rather than "static const". The former is deprecated according to the C standard. Tested by rebuilding with --enable-targets=all on x86-64 Fedora 18. * configure.ac (build_warnings): Add -Wold-style-declaration. * configure: Rebuild. * dsrec.c (make_srec): Use "static const", not "const static". * h8300-tdep.c (h8300_breakpoint_from_pc): Use "static const", not "const static". * mi/mi-parse.c (mi_no_values, mi_simple_values, mi_all_values): Use "static const", not "const static". * mn10300-tdep.c (mn10300_breakpoint_from_pc): Use "static const", not "const static". * moxie-tdep.c (moxie_breakpoint_from_pc): Use "static const", not "const static". * rs6000-tdep.c (rs6000_breakpoint_from_pc): Use "static const", not "const static". * v850-tdep.c (v850_breakpoint_from_pc): Use "static const", not "const static". (v850_dbtrap_breakpoint_from_pc): Likewise. * xstormy16-tdep.c (xstormy16_breakpoint_from_pc): Use "static const", not "const static". --- gdb/ChangeLog | 21 +++++++++++++++++++++ gdb/configure | 3 ++- gdb/configure.ac | 3 ++- gdb/dsrec.c | 8 ++++---- gdb/h8300-tdep.c | 2 +- gdb/mi/mi-parse.c | 6 +++--- gdb/mn10300-tdep.c | 2 +- gdb/moxie-tdep.c | 2 +- gdb/rs6000-tdep.c | 2 +- gdb/v850-tdep.c | 4 ++-- gdb/xstormy16-tdep.c | 2 +- 11 files changed, 39 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7ef6dbbdaa..6e2d355024 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,24 @@ +2013-07-01 Tom Tromey + + * configure.ac (build_warnings): Add -Wold-style-declaration. + * configure: Rebuild. + * dsrec.c (make_srec): Use "static const", not "const static". + * h8300-tdep.c (h8300_breakpoint_from_pc): Use "static const", + not "const static". + * mi/mi-parse.c (mi_no_values, mi_simple_values, mi_all_values): + Use "static const", not "const static". + * mn10300-tdep.c (mn10300_breakpoint_from_pc): Use "static const", + not "const static". + * moxie-tdep.c (moxie_breakpoint_from_pc): Use "static const", + not "const static". + * rs6000-tdep.c (rs6000_breakpoint_from_pc): Use "static const", + not "const static". + * v850-tdep.c (v850_breakpoint_from_pc): Use "static const", + not "const static". + (v850_dbtrap_breakpoint_from_pc): Likewise. + * xstormy16-tdep.c (xstormy16_breakpoint_from_pc): Use "static const", + not "const static". + 2013-07-01 Tom Tromey * configure.ac (build_warnings): Add -Wmissing-parameter-type. diff --git a/gdb/configure b/gdb/configure index ac2ff5f4c6..7e08fba659 100755 --- a/gdb/configure +++ b/gdb/configure @@ -12470,7 +12470,8 @@ build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \ -Wpointer-sign \ -Wno-unused -Wunused-value -Wunused-function \ -Wno-switch -Wno-char-subscripts -Wmissing-prototypes \ --Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type" +-Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type \ +-Wold-style-declaration" # Enable -Wno-format by default when using gcc on mingw since many # GCC versions complain about %I64. diff --git a/gdb/configure.ac b/gdb/configure.ac index b63faec587..e0e5dd4efd 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1940,7 +1940,8 @@ build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \ -Wpointer-sign \ -Wno-unused -Wunused-value -Wunused-function \ -Wno-switch -Wno-char-subscripts -Wmissing-prototypes \ --Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type" +-Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type \ +-Wold-style-declaration" # Enable -Wno-format by default when using gcc on mingw since many # GCC versions complain about %I64. diff --git a/gdb/dsrec.c b/gdb/dsrec.c index 04dd9c6f11..bc47f849dc 100644 --- a/gdb/dsrec.c +++ b/gdb/dsrec.c @@ -226,10 +226,10 @@ make_srec (char *srec, CORE_ADDR targ_addr, bfd *abfd, asection *sect, { unsigned char checksum; int tmp; - const static char hextab[] = "0123456789ABCDEF"; - const static char data_code_table[] = "123"; - const static char term_code_table[] = "987"; - const static char header_code_table[] = "000"; + static const char hextab[] = "0123456789ABCDEF"; + static const char data_code_table[] = "123"; + static const char term_code_table[] = "987"; + static const char header_code_table[] = "000"; char const *code_table; int addr_size; int payload_size; diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index 0e9d6c4b8a..ef80247b54 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -1192,7 +1192,7 @@ h8300s_dbg_reg_to_regnum (struct gdbarch *gdbarch, int regno) return regno; } -const static unsigned char * +static const unsigned char * h8300_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr) { diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c index 0f35f1d6d2..a3c184910b 100644 --- a/gdb/mi/mi-parse.c +++ b/gdb/mi/mi-parse.c @@ -28,9 +28,9 @@ #include "gdb_string.h" #include "cli/cli-utils.h" -const static char mi_no_values[] = "--no-values"; -const static char mi_simple_values[] = "--simple-values"; -const static char mi_all_values[] = "--all-values"; +static const char mi_no_values[] = "--no-values"; +static const char mi_simple_values[] = "--simple-values"; +static const char mi_all_values[] = "--all-values"; /* Like parse_escape, but leave the results as a host char, not a target char. */ diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index c31af8d79d..32aa5f5c5b 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -326,7 +326,7 @@ mn10300_write_pc (struct regcache *regcache, CORE_ADDR val) so we need a single byte breakpoint. Matsushita hasn't defined one, so we defined it ourselves. */ -const static unsigned char * +static const unsigned char * mn10300_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *bp_addr, int *bp_size) { diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c index 79d160b21c..cb04786d0a 100644 --- a/gdb/moxie-tdep.c +++ b/gdb/moxie-tdep.c @@ -72,7 +72,7 @@ moxie_frame_align (struct gdbarch *gdbarch, CORE_ADDR sp) /* Implement the "breakpoint_from_pc" gdbarch method. */ -const static unsigned char * +static const unsigned char * moxie_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr) { diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index d3ff09d8bf..59e129f318 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -943,7 +943,7 @@ rs6000_fetch_pointer_argument (struct frame_info *frame, int argi, /* Sequence of bytes for breakpoint instruction. */ -const static unsigned char * +static const unsigned char * rs6000_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *bp_addr, int *bp_size) { diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c index 16fe825ee6..becb0512c6 100644 --- a/gdb/v850-tdep.c +++ b/gdb/v850-tdep.c @@ -1170,7 +1170,7 @@ v850_return_value (struct gdbarch *gdbarch, struct value *function, return RETURN_VALUE_REGISTER_CONVENTION; } -const static unsigned char * +static const unsigned char * v850_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr) { @@ -1184,7 +1184,7 @@ v850_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, Older architectures had no such instruction. For those, an unconditional branch to self instruction is used. */ -const static unsigned char * +static const unsigned char * v850_dbtrap_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr) { diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index cb551ff220..99b0c5e0cc 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -505,7 +505,7 @@ xstormy16_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc) return 0; } -const static unsigned char * +static const unsigned char * xstormy16_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr) { -- 2.34.1