From 968bc5cc86bff4ebf89e63bf99db7c7e777d4756 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 29 Oct 2015 12:55:03 +0000 Subject: [PATCH] bfd/libhppa.h: Make C++ compatible MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes this when GDB is built in C++ mode: In file included from /home/pedro/gdb/mygit/src/gdb/../bfd/som.h:27:0, from /home/pedro/gdb/mygit/src/gdb/somread.c:31: /home/pedro/gdb/mygit/src/gdb/../bfd/libhppa.h: In function ‘int bfd_hppa_insn2fmt(bfd*, int)’: /home/pedro/gdb/mygit/src/gdb/../bfd/libhppa.h:380:42: error: invalid conversion from ‘int’ to ‘hppa_opcode_type’ [-fpermissive] #define get_opcode(insn) (((insn) >> 26) & 0x3f) ^ /home/pedro/gdb/mygit/src/gdb/../bfd/libhppa.h:465:30: note: in expansion of macro ‘get_opcode’ enum hppa_opcode_type op = get_opcode (insn); ^ bfd/ChangeLog: 2015-10-29 Pedro Alves * libhppa.h (bfd_hppa_insn2fmt): Add cast. --- bfd/ChangeLog | 4 ++++ bfd/libhppa.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e124aa61f13..cedceadecb7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2015-10-29 Pedro Alves + + * libhppa.h (bfd_hppa_insn2fmt): Add cast. + 2015-10-28 H.J. Lu * elf32-i386.c (elf_i386_relocate_section): Fix a typo in diff --git a/bfd/libhppa.h b/bfd/libhppa.h index 9832ccd383e..4786f357a01 100644 --- a/bfd/libhppa.h +++ b/bfd/libhppa.h @@ -462,7 +462,7 @@ enum hppa_opcode_type static inline int bfd_hppa_insn2fmt (bfd *abfd, int insn) { - enum hppa_opcode_type op = get_opcode (insn); + enum hppa_opcode_type op = (enum hppa_opcode_type) get_opcode (insn); switch (op) { -- 2.30.2