From 07774fccc3280323f43db9ed204f628503b34663 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 10 Feb 2015 18:09:39 +0000 Subject: opcodes/microblaze: Rename 'or', 'and', 'xor' to avoid C++ conflict MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tom Tromey * microblaze-opcm.h (or, and, xor): Rename to microblaze_or, microblaze_and, microblaze_xor. * microblaze-opc.h (opcodes): Adjust. --- opcodes/ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'opcodes/ChangeLog') 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 + Tom Tromey + + * microblaze-opcm.h (or, and, xor): Rename to microblaze_or, + microblaze_and, microblaze_xor. + * microblaze-opc.h (opcodes): Adjust. + 2015-01-28 James Bowman * Makefile.am: Add FT32 files. -- cgit v1.1