arc: Replace ARC_SHORT macro with arc_opcode_len function

[deliverable/binutils-gdb.git] / opcodes / sh-opc.h

diff --git a/opcodes/sh-opc.h b/opcodes/sh-opc.h
index 5916c6a99bfd7dd38885d830563c11b7d3f0d292..d64f50ce1b764783de15c25b9e910599d62d43c8 100644 (file)
--- a/opcodes/sh-opc.h
+++ b/opcodes/sh-opc.h
@@ -20,6 +20,10 @@
 
 #include "bfd.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef enum
   {
     HEX_0,
@@ -230,7 +234,7 @@ sh_dsp_reg_nums;
 #define arch_sh_no_co     (1 << 28)  /* Neither FPU nor DSP co-processor.  */
 #define arch_sh_sp_fpu    (1 << 29)  /* Single precision FPU.  */
 #define arch_sh_dp_fpu    (1 << 30)  /* Double precision FPU.  */
-#define arch_sh_has_dsp           (1 << 31)
+#define arch_sh_has_dsp           (1u << 31)
 #define arch_sh_co_mask    MASK (28, 31)
 
 
@@ -281,7 +285,6 @@ sh_dsp_reg_nums;
 unsigned int sh_get_arch_from_bfd_mach (unsigned long mach);
 unsigned int sh_get_arch_up_from_bfd_mach (unsigned long mach);
 unsigned long sh_get_bfd_mach_from_arch_set (unsigned int arch_set);
-bfd_boolean sh_merge_bfd_arch (bfd *ibfd, bfd *obfd);
 
 /* Below are the 'architecture sets'.
    They describe the following inheritance graph:
@@ -371,7 +374,7 @@ SH4AL-dsp                                          SH4A
 
 typedef struct
 {
-  char *name;
+  const char *name;
   sh_arg_type arg[4];
   sh_nibble_type nibbles[9];
   unsigned int arch;
@@ -1197,4 +1200,8 @@ const sh_opcode_info sh_table[] =
 { 0, {0}, {0}, 0 }
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif