diff options
| author | Yao Qi <yao.qi@linaro.org> | 2015-10-07 12:23:15 +0100 |
|---|---|---|
| committer | Yao Qi <yao.qi@linaro.org> | 2015-10-07 15:22:47 +0100 |
| commit | 875880c661e71a7622d8f7282f0dd1ef756040ff (patch) | |
| tree | 6afe61415e4bd8c415f39b5292e696698cc980bb /include | |
| parent | d3e12b29aef25bc9d1830b0a05643b11296f1b8f (diff) | |
| download | gdb-875880c661e71a7622d8f7282f0dd1ef756040ff.zip gdb-875880c661e71a7622d8f7282f0dd1ef756040ff.tar.gz gdb-875880c661e71a7622d8f7282f0dd1ef756040ff.tar.bz2 | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/opcode/ChangeLog | 5 | ||||
| -rw-r--r-- | include/opcode/aarch64.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index 67b4e41..ea833f7 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,5 +1,10 @@ 2015-10-07 Yao Qi <yao.qi@linaro.org> + * aarch64.h (aarch64_sys_ins_reg) <template>: Removed. + <name>: New field. + +2015-10-07 Yao Qi <yao.qi@linaro.org> + * aarch64.h [__cplusplus]: Wrap in extern "C". 2015-10-07 Claudiu Zissulescu <claziss@synopsys.com> diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h index a8b1f89..c423858 100644 --- a/include/opcode/aarch64.h +++ b/include/opcode/aarch64.h @@ -652,7 +652,7 @@ extern bfd_boolean aarch64_pstatefield_supported_p (const aarch64_feature_set, typedef struct { - const char *template; + const char *name; uint32_t value; int has_xt; } aarch64_sys_ins_reg; |