From a2e3e93f4423899d99687da3ce4ac57cbed437f9 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 29 Jan 2016 15:32:29 -0500 Subject: [PATCH 1/1] Fix two misleading indentation warnings Two small changes so everything builds with latest GCC and its -Wmisleading-indentation. In the aarch64-tdep.c case, the two misindented lines should actually be part of the for loop. It looks like the indentation is all done using spaces in that file though... I fixed it (changed for tabs + spaces) for the lines I touched. In the xcoffread.c case, we can simply remove the braces and fix the indentation. gdb/ChangeLog: * aarch64-tdep.c (aarch64_record_asimd_load_store): Add braces to for include additional lines. * xcoffread.c (scan_xcoff_symtab): Remove unnecessary braces. --- gdb/ChangeLog | 6 ++++++ gdb/aarch64-tdep.c | 20 +++++++++++--------- gdb/xcoffread.c | 13 ++++++------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0e191d72dc..635202a6a6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2016-01-29 Simon Marchi + + * aarch64-tdep.c (aarch64_record_asimd_load_store): Add braces + to for include additional lines. + * xcoffread.c (scan_xcoff_symtab): Remove unnecessary braces. + 2016-01-28 Simon Marchi * gnulib/import/Makefile.am: Regenerate. diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index c7da618e0c..798a1b719e 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -3192,15 +3192,17 @@ aarch64_record_asimd_load_store (insn_decode_record *aarch64_insn_r) else { for (sindex = 0; sindex < selem; sindex++) - if (bit (aarch64_insn_r->aarch64_insn, 22)) - record_buf[reg_index++] = reg_rt + AARCH64_V0_REGNUM; - else - { - record_buf_mem[mem_index++] = esize / 8; - record_buf_mem[mem_index++] = address + addr_offset; - } - addr_offset = addr_offset + (esize / 8); - reg_rt = (reg_rt + 1) % 32; + { + if (bit (aarch64_insn_r->aarch64_insn, 22)) + record_buf[reg_index++] = reg_rt + AARCH64_V0_REGNUM; + else + { + record_buf_mem[mem_index++] = esize / 8; + record_buf_mem[mem_index++] = address + addr_offset; + } + addr_offset = addr_offset + (esize / 8); + reg_rt = (reg_rt + 1) % 32; + } } } /* Load/store multiple structure. */ diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index 533a33a7be..c67094980a 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -2381,13 +2381,12 @@ scan_xcoff_symtab (struct objfile *objfile) if (first_fun_line_offset == 0 && symbol.n_numaux > 1) first_fun_line_offset = main_aux[0].x_sym.x_fcnary.x_fcn.x_lnnoptr; - { - record_minimal_symbol - (namestring, symbol.n_value, - sclass == C_HIDEXT ? mst_file_text : mst_text, - symbol.n_scnum, objfile); - misc_func_recorded = 1; - } + + record_minimal_symbol + (namestring, symbol.n_value, + sclass == C_HIDEXT ? mst_file_text : mst_text, + symbol.n_scnum, objfile); + misc_func_recorded = 1; break; case XMC_GL: -- 2.34.1