darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xtensa: Avoid designated inits, for C++ compliance

Browse source 
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.
This commit is contained in:
Andreas Arnez 2016-08-25 19:13:57 +02:00
parent 4811ccb48f
commit ae68ff9f28
2 changed files with 55 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -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> 2016-08-25 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* aarch64-linux-nat.c (ps_get_thread_area): Remove const from * aarch64-linux-nat.c (ps_get_thread_area): Remove const from

90
gdb/xtensa-tdep.h
View file

@ -226,52 +226,52 @@ struct gdbarch_tdep
#define XTENSA_GDBARCH_TDEP_INSTANTIATE(rmap,spillsz) \ #define XTENSA_GDBARCH_TDEP_INSTANTIATE(rmap,spillsz) \
{ \ { \
.target_flags = 0, \ 0, /* target_flags */ \
.spill_location = -1, \ -1, /* spill_location */ \
.spill_size = (spillsz), \ (spillsz), /* spill_size */ \
.unused = 0, \ 0, /* unused */ \
.call_abi = (XSHAL_ABI == XTHAL_ABI_CALL0 \ (XSHAL_ABI == XTHAL_ABI_CALL0 \
? CallAbiCall0Only \ ? CallAbiCall0Only \
: CallAbiDefault), \ : CallAbiDefault), /* call_abi */ \
.debug_interrupt_level = XCHAL_DEBUGLEVEL, \ XCHAL_DEBUGLEVEL, /* debug_interrupt_level */ \
.icache_line_bytes = XCHAL_ICACHE_LINESIZE, \ XCHAL_ICACHE_LINESIZE, /* icache_line_bytes */ \
.dcache_line_bytes = XCHAL_DCACHE_LINESIZE, \ XCHAL_DCACHE_LINESIZE, /* dcache_line_bytes */ \
.dcache_writeback = XCHAL_DCACHE_IS_WRITEBACK, \ XCHAL_DCACHE_IS_WRITEBACK, /* dcache_writeback */ \
.isa_use_windowed_registers = (XSHAL_ABI != XTHAL_ABI_CALL0), \ (XSHAL_ABI != XTHAL_ABI_CALL0), /* isa_use_windowed_registers */ \
.isa_use_density_instructions = XCHAL_HAVE_DENSITY, \ XCHAL_HAVE_DENSITY, /* isa_use_density_instructions */ \
.isa_use_exceptions = XCHAL_HAVE_EXCEPTIONS, \ XCHAL_HAVE_EXCEPTIONS, /* isa_use_exceptions */ \
.isa_use_ext_l32r = XSHAL_USE_ABSOLUTE_LITERALS, \ XSHAL_USE_ABSOLUTE_LITERALS, /* isa_use_ext_l32r */ \
.isa_max_insn_size = XCHAL_MAX_INSTRUCTION_SIZE, \ XCHAL_MAX_INSTRUCTION_SIZE, /* isa_max_insn_size */ \
.debug_num_ibreaks = XCHAL_NUM_IBREAK, \ XCHAL_NUM_IBREAK, /* debug_num_ibreaks */ \
.debug_num_dbreaks = XCHAL_NUM_DBREAK, \ XCHAL_NUM_DBREAK, /* debug_num_dbreaks */ \
.regmap = rmap, \ rmap, /* regmap */ \
.num_regs = 0, \ 0, /* num_regs */ \
.num_nopriv_regs = 0, \ 0, /* num_nopriv_regs */ \
.num_pseudo_regs = 0, \ 0, /* num_pseudo_regs */ \
.num_aregs = XCHAL_NUM_AREGS, \ XCHAL_NUM_AREGS, /* num_aregs */ \
.num_contexts = XCHAL_NUM_CONTEXTS, \ XCHAL_NUM_CONTEXTS, /* num_contexts */ \
.ar_base = -1, \ -1, /* ar_base */ \
.a0_base = -1, \ -1, /* a0_base */ \
.wb_regnum = -1, \ -1, /* wb_regnum */ \
.ws_regnum = -1, \ -1, /* ws_regnum */ \
.pc_regnum = -1, \ -1, /* pc_regnum */ \
.ps_regnum = -1, \ -1, /* ps_regnum */ \
.lbeg_regnum = -1, \ -1, /* lbeg_regnum */ \
.lend_regnum = -1, \ -1, /* lend_regnum */ \
.lcount_regnum = -1, \ -1, /* lcount_regnum */ \
.sar_regnum = -1, \ -1, /* sar_regnum */ \
.litbase_regnum = -1, \ -1, /* litbase_regnum */ \
.interrupt_regnum = -1, \ -1, /* interrupt_regnum */ \
.interrupt2_regnum = -1, \ -1, /* interrupt2_regnum */ \
.cpenable_regnum = -1, \ -1, /* cpenable_regnum */ \
.debugcause_regnum = -1, \ -1, /* debugcause_regnum */ \
.exccause_regnum = -1, \ -1, /* exccause_regnum */ \
.excvaddr_regnum = -1, \ -1, /* excvaddr_regnum */ \
.max_register_raw_size = 0, \ 0, /* max_register_raw_size */ \
.max_register_virtual_size = 0, \ 0, /* max_register_virtual_size */ \
.fp_layout = 0, \ 0, /* fp_layout */ \
.fp_layout_bytes = 0, \ 0, /* fp_layout_bytes */ \
.gregmap = 0, \ 0, /* gregmap */ \
} }
#define XTENSA_CONFIG_INSTANTIATE(rmap,spill_size) \ #define XTENSA_CONFIG_INSTANTIATE(rmap,spill_size) \
struct gdbarch_tdep xtensa_tdep = \ struct gdbarch_tdep xtensa_tdep = \