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/ChangeLog | |
| 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/ChangeLog')
| -rw-r--r-- | opcodes/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 89fe9ce..b400f5b 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,10 @@ +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. + 2015-01-28 James Bowman <james.bowman@ftdichip.com> * Makefile.am: Add FT32 files. |