diff options
| author | Pedro Alves <palves@redhat.com> | 2015-02-10 18:09:39 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-02-10 18:09:39 +0000 |
| commit | 07774fccc3280323f43db9ed204f628503b34663 (patch) | |
| tree | 351c908fb95162e9339ed41e4759dd63156f4c60 /opcodes/microblaze-opcm.h | |
| parent | c1cc6152620563bbe861cfc2fa0a796e71ca87b5 (diff) | |
| download | fsf-binutils-gdb-07774fccc3280323f43db9ed204f628503b34663.zip fsf-binutils-gdb-07774fccc3280323f43db9ed204f628503b34663.tar.gz fsf-binutils-gdb-07774fccc3280323f43db9ed204f628503b34663.tar.bz2 | |
opcodes/microblaze: Rename 'or', 'and', 'xor' to avoid C++ conflict
Building GDB as a C++ program, we see:
In file included from gdb/microblaze-tdep.c:37:0:
gdb/../opcodes/../opcodes/microblaze-opcm.h: At global scope:
gdb/../opcodes/../opcodes/microblaze-opcm.h:32:51: error: expected identifier before ‘or’ token
ncget, ncput, muli, bslli, bsrai, bsrli, mului, or, and, xor,
^
gdb/../opcodes/../opcodes/microblaze-opcm.h:32:51: error: expected ‘}’ before ‘or’ token
gdb/../opcodes/../opcodes/microblaze-opcm.h:32:51: error: expected unqualified-id before ‘or’ token
gdb/../opcodes/../opcodes/microblaze-opcm.h:60:1: error: expected declaration before ‘}’ token
};
^
opcodes/ChangeLog:
2015-02-10 Pedro Alves <palves@redhat.com>
Tom Tromey <tromey@redhat.com>
* microblaze-opcm.h (or, and, xor): Rename to microblaze_or,
microblaze_and, microblaze_xor.
* microblaze-opc.h (opcodes): Adjust.
Diffstat (limited to 'opcodes/microblaze-opcm.h')
| -rw-r--r-- | opcodes/microblaze-opcm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h index f59c48c..0263148 100644 --- a/opcodes/microblaze-opcm.h +++ b/opcodes/microblaze-opcm.h @@ -29,7 +29,9 @@ enum microblaze_instr addi, rsubi, addic, rsubic, addik, rsubik, addikc, rsubikc, mul, mulh, mulhu, mulhsu,swapb,swaph, idiv, idivu, bsll, bsra, bsrl, get, put, nget, nput, cget, cput, - ncget, ncput, muli, bslli, bsrai, bsrli, mului, or, and, xor, + ncget, ncput, muli, bslli, bsrai, bsrli, mului, + /* 'or/and/xor' are C++ keywords. */ + microblaze_or, microblaze_and, microblaze_xor, andn, pcmpbf, pcmpbc, pcmpeq, pcmpne, sra, src, srl, sext8, sext16, wic, wdc, wdcclear, wdcflush, mts, mfs, mbar, br, brd, brld, bra, brad, brald, microblaze_brk, beq, beqd, bne, bned, blt, |