Bring Cygnus versions into the trunk, keeping our local patches

1 files changed, 74 insertions, 14 deletions

diff --git a/gnu/usr.bin/binutils/bfd/libhppa.h b/gnu/usr.bin/binutils/bfd/libhppa.h
index dd863aa32f3..cb7f2b9032c 100644
--- a/gnu/usr.bin/binutils/bfd/libhppa.h
+++ b/gnu/usr.bin/binutils/bfd/libhppa.h
@@ -1,5 +1,5 @@
 /* HP PA-RISC SOM object file format:  definitions internal to BFD.
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
+   Copyright (C) 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
 
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
@@ -34,8 +34,48 @@
 #endif /* GNU C? */
 #endif /* INLINE */
 
+#if __GNUC__ >= 2 && __GNUC_MINOR__ >= 7
+/* Declare the functions with the unused attribute to avoid warnings.  */
+static INLINE unsigned int assemble_3 (unsigned int)
+     __attribute__ ((__unused__));
+static INLINE void dis_assemble_3 (unsigned int, unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned int assemble_12 (unsigned int, unsigned int)
+     __attribute__ ((__unused__));
+static INLINE void dis_assemble_12 (unsigned int, unsigned int *,
+				    unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned long assemble_17 (unsigned int, unsigned int,
+					 unsigned int)
+     __attribute__ ((__unused__));
+static INLINE void dis_assemble_17 (unsigned int, unsigned int *,
+				    unsigned int *, unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned long assemble_21 (unsigned int)
+     __attribute ((__unused__));
+static INLINE void dis_assemble_21 (unsigned int, unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned long sign_extend (unsigned int, unsigned int)
+     __attribute__ ((__unused__));
+static INLINE unsigned int ones (int) __attribute ((__unused__));
+static INLINE void sign_unext (unsigned int, unsigned int, unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned long low_sign_extend (unsigned int, unsigned int)
+     __attribute__ ((__unused__));
+static INLINE void low_sign_unext (unsigned int, unsigned int, unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned long hppa_field_adjust (unsigned long, unsigned long,
+					       unsigned short)
+     __attribute__ ((__unused__));
+static INLINE char bfd_hppa_insn2fmt (unsigned long)
+     __attribute__ ((__unused__));
+static INLINE  unsigned long hppa_rebuild_insn (bfd *, unsigned long,
+						unsigned long, unsigned long)
+     __attribute__ ((__unused__));
+#endif /* gcc 2.7 or higher */
+
 /* The PA instruction set variants.  */
-enum pa_arch {pa10 = 10, pa11 = 11};
+enum pa_arch {pa10 = 10, pa11 = 11, pa20 = 20};
 
 /* HP PA-RISC relocation types */
 
@@ -50,12 +90,15 @@ enum hppa_reloc_field_selector_type
     R_HPPA_RDSEL = 0x6,
     R_HPPA_LRSEL = 0x7,
     R_HPPA_RRSEL = 0x8,
-    R_HPPA_PSEL = 0x9,
-    R_HPPA_LPSEL = 0xa,
-    R_HPPA_RPSEL = 0xb,
-    R_HPPA_TSEL = 0xc,
-    R_HPPA_LTSEL = 0xd,
-    R_HPPA_RTSEL = 0xe
+    R_HPPA_NSEL  = 0x9,
+    R_HPPA_NLSEL  = 0xa,
+    R_HPPA_NLRSEL  = 0xb,
+    R_HPPA_PSEL = 0xc,
+    R_HPPA_LPSEL = 0xd,
+    R_HPPA_RPSEL = 0xe,
+    R_HPPA_TSEL = 0xf,
+    R_HPPA_LTSEL = 0x10,
+    R_HPPA_RTSEL = 0x11
   };
 
 /* /usr/include/reloc.h defines these to constants.  We want to use
@@ -72,6 +115,9 @@ enum hppa_reloc_field_selector_type
 #undef e_rdsel
 #undef e_lrsel
 #undef e_rrsel
+#undef e_nsel
+#undef e_nlsel
+#undef e_nlrsel
 #undef e_psel
 #undef e_lpsel
 #undef e_rpsel
@@ -97,6 +143,9 @@ enum hppa_reloc_field_selector_type_alt
     e_rdsel = R_HPPA_RDSEL,
     e_lrsel = R_HPPA_LRSEL,
     e_rrsel = R_HPPA_RRSEL,
+    e_nsel = R_HPPA_NSEL,
+    e_nlsel = R_HPPA_NLSEL,
+    e_nlrsel = R_HPPA_NLRSEL,
     e_psel = R_HPPA_PSEL,
     e_lpsel = R_HPPA_LPSEL,
     e_rpsel = R_HPPA_RPSEL,
@@ -307,6 +356,7 @@ hppa_field_adjust (value, constant_value, r_field)
   switch (r_field)
     {
     case e_fsel:		/* F  : no change                      */
+    case e_nsel:		/* N  : no change		       */
       value += constant_value;
       break;
 
@@ -327,6 +377,7 @@ hppa_field_adjust (value, constant_value, r_field)
       break;
 
     case e_lsel:		/* L  : Arithmetic shift right 11 bits */
+    case e_nlsel:		/* NL  : Arithmetic shift right 11 bits */
       value += constant_value;
       value = (value & 0xfffff800) >> 11;
       break;
@@ -349,6 +400,7 @@ hppa_field_adjust (value, constant_value, r_field)
       break;
 
     case e_lrsel:		/* LR : L with "rounded" constant      */
+    case e_nlrsel:		/* NLR : NL with "rounded" constant      */
       value = value + ((constant_value + 0x1000) & 0xffffe000);
       value = (value & 0xfffff800) >> 11;
       break;
@@ -505,9 +557,13 @@ hppa_rebuild_insn (abfd, insn, value, r_format)
       }
 
     case 14:
-      const_part = insn & 0xffffc000;
-      low_sign_unext (value, 14, &rebuilt_part);
-      return const_part | rebuilt_part;
+      {
+	unsigned int ext;
+	
+	const_part = insn & 0xffffc000;
+	low_sign_unext (value, 14, &ext);
+	return const_part | ext;
+      }
 
     case 17:
       {
@@ -520,9 +576,13 @@ hppa_rebuild_insn (abfd, insn, value, r_format)
       }
 
     case 21:
-      const_part = insn & 0xffe00000;
-      dis_assemble_21 (value, &rebuilt_part);
-      return const_part | rebuilt_part;
+      {
+	unsigned int w;
+
+	const_part = insn & 0xffe00000;
+	dis_assemble_21 (value, &w);
+	return const_part | w;
+      }
 
     case 32:
       const_part = 0;