diff options
author | Andreas Arnez <arnez@linux.vnet.ibm.com> | 2016-08-25 19:13:57 +0200 |
---|---|---|
committer | Andreas Arnez <arnez@linux.vnet.ibm.com> | 2016-08-25 19:13:57 +0200 |
commit | ae68ff9f280902d9cead28b90979e75dc046492e (patch) | |
tree | 3915210db15d009d505118495a98fc311d41f705 | |
parent | 4811ccb48f0d24b9ae2ce37a06af575fbd83a55d (diff) | |
download | fsf-binutils-gdb-ae68ff9f280902d9cead28b90979e75dc046492e.zip fsf-binutils-gdb-ae68ff9f280902d9cead28b90979e75dc046492e.tar.gz fsf-binutils-gdb-ae68ff9f280902d9cead28b90979e75dc046492e.tar.bz2 |
xtensa: Avoid designated inits, for C++ compliance
C++ does not officially support designators in initializer lists. Thus
some compilers may issue errors when encountering them. Modern versions
of GCC seem to allow them by default, as a GCC extension, even though
the GCC documentation explicitly states otherwise: "[...] This extension
is not implemented in GNU C++." But some older GCC versions (like
4.4.7) did indeed emit an error instead, like this:
.../gdb/xtensa-config.c:219: error: expected primary-expression before
‘.’ token
This patch removes the only such instance I've seen when building with
'--enable-targets=all'.
gdb/ChangeLog:
* xtensa-tdep.h (XTENSA_GDBARCH_TDEP_INSTANTIATE): Replace
designated initializer list by plain initializer list, for C++
compliance.
-rw-r--r-- | gdb/ChangeLog | 6 | ||||
-rw-r--r-- | gdb/xtensa-tdep.h | 98 |
2 files changed, 55 insertions, 49 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 677ed7d..7f580f0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2016-08-25 Andreas Arnez <arnez@linux.vnet.ibm.com> + + * xtensa-tdep.h (XTENSA_GDBARCH_TDEP_INSTANTIATE): Replace + designated initializer list by plain initializer list, for C++ + compliance. + 2016-08-25 Adhemerval Zanella <adhemerval.zanella@linaro.org> * aarch64-linux-nat.c (ps_get_thread_area): Remove const from diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h index b2b1903..c83e312 100644 --- a/gdb/xtensa-tdep.h +++ b/gdb/xtensa-tdep.h @@ -224,55 +224,55 @@ struct gdbarch_tdep /* Macro to instantiate a gdbarch_tdep structure. */ -#define XTENSA_GDBARCH_TDEP_INSTANTIATE(rmap,spillsz) \ - { \ - .target_flags = 0, \ - .spill_location = -1, \ - .spill_size = (spillsz), \ - .unused = 0, \ - .call_abi = (XSHAL_ABI == XTHAL_ABI_CALL0 \ - ? CallAbiCall0Only \ - : CallAbiDefault), \ - .debug_interrupt_level = XCHAL_DEBUGLEVEL, \ - .icache_line_bytes = XCHAL_ICACHE_LINESIZE, \ - .dcache_line_bytes = XCHAL_DCACHE_LINESIZE, \ - .dcache_writeback = XCHAL_DCACHE_IS_WRITEBACK, \ - .isa_use_windowed_registers = (XSHAL_ABI != XTHAL_ABI_CALL0), \ - .isa_use_density_instructions = XCHAL_HAVE_DENSITY, \ - .isa_use_exceptions = XCHAL_HAVE_EXCEPTIONS, \ - .isa_use_ext_l32r = XSHAL_USE_ABSOLUTE_LITERALS, \ - .isa_max_insn_size = XCHAL_MAX_INSTRUCTION_SIZE, \ - .debug_num_ibreaks = XCHAL_NUM_IBREAK, \ - .debug_num_dbreaks = XCHAL_NUM_DBREAK, \ - .regmap = rmap, \ - .num_regs = 0, \ - .num_nopriv_regs = 0, \ - .num_pseudo_regs = 0, \ - .num_aregs = XCHAL_NUM_AREGS, \ - .num_contexts = XCHAL_NUM_CONTEXTS, \ - .ar_base = -1, \ - .a0_base = -1, \ - .wb_regnum = -1, \ - .ws_regnum = -1, \ - .pc_regnum = -1, \ - .ps_regnum = -1, \ - .lbeg_regnum = -1, \ - .lend_regnum = -1, \ - .lcount_regnum = -1, \ - .sar_regnum = -1, \ - .litbase_regnum = -1, \ - .interrupt_regnum = -1, \ - .interrupt2_regnum = -1, \ - .cpenable_regnum = -1, \ - .debugcause_regnum = -1, \ - .exccause_regnum = -1, \ - .excvaddr_regnum = -1, \ - .max_register_raw_size = 0, \ - .max_register_virtual_size = 0, \ - .fp_layout = 0, \ - .fp_layout_bytes = 0, \ - .gregmap = 0, \ - } +#define XTENSA_GDBARCH_TDEP_INSTANTIATE(rmap,spillsz) \ + { \ + 0, /* target_flags */ \ + -1, /* spill_location */ \ + (spillsz), /* spill_size */ \ + 0, /* unused */ \ + (XSHAL_ABI == XTHAL_ABI_CALL0 \ + ? CallAbiCall0Only \ + : CallAbiDefault), /* call_abi */ \ + XCHAL_DEBUGLEVEL, /* debug_interrupt_level */ \ + XCHAL_ICACHE_LINESIZE, /* icache_line_bytes */ \ + XCHAL_DCACHE_LINESIZE, /* dcache_line_bytes */ \ + XCHAL_DCACHE_IS_WRITEBACK, /* dcache_writeback */ \ + (XSHAL_ABI != XTHAL_ABI_CALL0), /* isa_use_windowed_registers */ \ + XCHAL_HAVE_DENSITY, /* isa_use_density_instructions */ \ + XCHAL_HAVE_EXCEPTIONS, /* isa_use_exceptions */ \ + XSHAL_USE_ABSOLUTE_LITERALS, /* isa_use_ext_l32r */ \ + XCHAL_MAX_INSTRUCTION_SIZE, /* isa_max_insn_size */ \ + XCHAL_NUM_IBREAK, /* debug_num_ibreaks */ \ + XCHAL_NUM_DBREAK, /* debug_num_dbreaks */ \ + rmap, /* regmap */ \ + 0, /* num_regs */ \ + 0, /* num_nopriv_regs */ \ + 0, /* num_pseudo_regs */ \ + XCHAL_NUM_AREGS, /* num_aregs */ \ + XCHAL_NUM_CONTEXTS, /* num_contexts */ \ + -1, /* ar_base */ \ + -1, /* a0_base */ \ + -1, /* wb_regnum */ \ + -1, /* ws_regnum */ \ + -1, /* pc_regnum */ \ + -1, /* ps_regnum */ \ + -1, /* lbeg_regnum */ \ + -1, /* lend_regnum */ \ + -1, /* lcount_regnum */ \ + -1, /* sar_regnum */ \ + -1, /* litbase_regnum */ \ + -1, /* interrupt_regnum */ \ + -1, /* interrupt2_regnum */ \ + -1, /* cpenable_regnum */ \ + -1, /* debugcause_regnum */ \ + -1, /* exccause_regnum */ \ + -1, /* excvaddr_regnum */ \ + 0, /* max_register_raw_size */ \ + 0, /* max_register_virtual_size */ \ + 0, /* fp_layout */ \ + 0, /* fp_layout_bytes */ \ + 0, /* gregmap */ \ + } #define XTENSA_CONFIG_INSTANTIATE(rmap,spill_size) \ struct gdbarch_tdep xtensa_tdep = \ XTENSA_GDBARCH_TDEP_INSTANTIATE(rmap,spill_size); |