Avoid using 'template' C++ keyword
authorYao Qi <yao.qi@linaro.org>
Wed, 7 Oct 2015 11:23:15 +0000 (12:23 +0100)
committerYao Qi <yao.qi@linaro.org>
Wed, 7 Oct 2015 14:22:47 +0000 (15:22 +0100)
commit875880c661e71a7622d8f7282f0dd1ef756040ff
tree6afe61415e4bd8c415f39b5292e696698cc980bb
parentd3e12b29aef25bc9d1830b0a05643b11296f1b8f
Avoid using 'template' C++ keyword

'template' is used in include/opcode/aarch64.h as below,

 typedef struct
 {
   const char *template;
   uint32_t value;
   int has_xt;
 } aarch64_sys_ins_reg;

and it triggers compilation errors when GDB is built in C++ mode.

In file included from git/gdb/aarch64-tdep.c:62:0:
git/gdb/../include/opcode/aarch64.h:651:15: error: expected unqualified-id before 'template'
   const char *template;

This patch is to rename field template to name.

gas/

* config/tc-aarch64.c (md_begin): Access field 'name' rather
than 'template'.

include/opcode/

* aarch64.h (aarch64_sys_ins_reg) <template>: Removed.
<name>: New field.

opcodes/

* aarch64-dis.c (aarch64_ext_sysins_op): Access field
'name' rather than 'template'.
* aarch64-opc.c (aarch64_print_operand): Likewise.
gas/ChangeLog
gas/config/tc-aarch64.c
include/opcode/ChangeLog
include/opcode/aarch64.h
opcodes/ChangeLog
opcodes/aarch64-dis.c
opcodes/aarch64-opc.c