From Pierre Muller <muller@ics.u-strasbg.fr>:
[deliverable/binutils-gdb.git] / bfd / elf32-hppa.c
index c08bcb3b258430aba65b954441575b413d5a842b..f57911a4b4cee5876113b061b72086e4579c05f5 100644 (file)
@@ -1,5 +1,6 @@
 /* BFD back-end for HP PA-RISC ELF files.
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
+   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
+   Free Software Foundation, Inc.
 
    Written by
 
@@ -21,3394 +22,1329 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
-#include "obstack.h"
-#include "bfdlink.h"
-#include "libelf.h"
+#include "elf-bfd.h"
+#include "elf/hppa.h"
+#include "libhppa.h"
+#include "elf32-hppa.h"
+#define ARCH_SIZE              32
+#include "elf-hppa.h"
+#include "elf32-hppa.h"
 
-/* Note there isn't much error handling code in here yet.  Unexpected
-   conditions are handled by just calling abort.  FIXME damnit! */
-/* ELF32/HPPA relocation support
 
-       This file contains ELF32/HPPA relocation support as specified
-       in the Stratus FTX/Golf Object File Format (SED-1762) dated
-       November 19, 1992.  */
+/* We use two hash tables to hold information for linking PA ELF objects.
 
-#include "elf32-hppa.h"
-#include "aout/aout64.h"
-#include "hppa_stubs.h"
+   The first is the elf32_hppa_link_hash_table which is derived
+   from the standard ELF linker hash table.  We use this as a place to
+   attach other hash tables and static information.
 
-/* The basic stub types supported.  If/when shared libraries are
-   implemented some form of IMPORT and EXPORT stubs will be needed.  */
-typedef enum
-{
-  HPPA_STUB_ILLEGAL,
-  HPPA_STUB_ARG_RELOC,
-  HPPA_STUB_LONG_CALL,
-} hppa_stub_type;
+   The second is the stub hash table which is derived from the
+   base BFD hash table.  The stub hash table holds the information
+   necessary to build the linker stubs during a link.  */
 
-/* This is a list of all the stubs for a particular BFD.  */
+/* Hash table for linker stubs.  */
 
-typedef struct elf32_hppa_stub_name_list_struct
+struct elf32_hppa_stub_hash_entry
 {
-  /* The symbol associated with this stub.  */
-  asymbol *sym;
-  /* Pointer to chain of all stub chains.  */
-  struct elf32_hppa_stub_description_struct *stub_desc;
-  /* Pointer to the stub contents (eg instructions).  */  
-  int *stub_secp;
-  /* Size of this stub?  (in what units?  FIXME).  */
-  unsigned size;
-  /* Pointer to the next stub entry in the chain.  */
-  struct elf32_hppa_stub_name_list_struct *next;
-} elf32_hppa_stub_name_list;
-
-/* This is a linked list in which each entry describes all the
-   linker stubs for a particular bfd.  */
-   
-typedef struct elf32_hppa_stub_description_struct
-{
-  /* The next group of stubs.  */
-  struct elf32_hppa_stub_description_struct *next;
-  /* Used to identify this group of stubs as belonging
-     to a particular bfd.  */
-  bfd *this_bfd;
-  /* FIXME: The stub section for this group of stubs?  Is
-     this redundant with stub_listP->sym->section?  */
+  /* Base hash table entry structure.  */
+  struct bfd_hash_entry root;
+
+  /* The stub section.  */
   asection *stub_sec;
-  /* FIXME: what the hell is this?  */
-  unsigned relocs_allocated_cnt;
-  /* The current real size of the stubs (in bytes?).  */
-  unsigned real_size;
-  /* How much space we have allocated for stubs (in bytes?).  */
-  unsigned allocated_size;
-  /* Pointer to the first available space for new stubs.  */
-  int *stub_secp;
-  /* Pointer to the beginning of the stubs.  FIXME: Why an int *
-     above and a char * here?  */
-  char *stub_contents;
-  /* The list of stubs for this bfd.  */
-  elf32_hppa_stub_name_list *stub_listP;
-  /* I guess we just carry this around for fun.  */
-  struct bfd_link_info *link_info;
-} elf32_hppa_stub_description;
-
-/* FIXME.  */
-#define ARGUMENTS      0
-#define RETURN_VALUE   1
-
-/* The various argument relocations that may be performed.
-   Note GRX,GRY really means ARGX,ARGY.  */
-typedef enum
-{
-  /* No relocation.  */
-  NO_ARG_RELOC,
-  /* Relocate 32 bits from general to FP register.  */
-  R_TO_FR,
-  /* Relocate 64 bits from arg0,arg1 to FParg1.  */
-  R01_TO_FR,
-  /* Relocate 64 bits from arg2,arg3 to FParg3.  */
-  R23_TO_FR,
-  /* Relocate 32 bits from FP to general register.  */
-  FR_TO_R,
-  /* Relocate 64 bits from FParg1 to arg0,arg1.  */
-  FR_TO_R01,
-  /* Relocate 64 bits from FParg3 to arg2,arg3.  */
-  FR_TO_R23,
-  /* Death.  */
-  ARG_RELOC_ERR,
-} arg_reloc_type;
-
-/* Where (what register type) is an argument comming from?  */
-typedef enum
-{
-  /* Not in a register.  */
-  AR_NO,
-  /* In a general argument register.  */
-  AR_GR,
-  /* In right half of a FP argument register.  */
-  AR_FR,
-  /* In upper (left) half of a FP argument register.  */
-  AR_FU,
-  /* In general argument register pair 0 (arg0, arg1).  */
-  AR_DBL01,
-  /* In general argument register pair 1 (arg2, arg3).  */
-  AR_DBL23,
-} arg_location;
-
-/* What is being relocated (eg which argument or the return value).  */
-typedef enum
-{
-  ARG0, ARG1, ARG2, ARG3, RETVAL,
-} arg_reloc_location;
-
-/* Horizontal represents callee's argument location information, vertical
-   represents caller's argument location information.  Value at a particular
-   X, Y location represents what (if any) argument relocation needs to
-   be performed to make caller and callee agree.  */
-static CONST arg_reloc_type mismatches[6][6] =
-{
- {NO_ARG_RELOC, NO_ARG_RELOC, NO_ARG_RELOC, NO_ARG_RELOC,
-    NO_ARG_RELOC, NO_ARG_RELOC},
- {NO_ARG_RELOC, NO_ARG_RELOC, R_TO_FR, ARG_RELOC_ERR,
-    R01_TO_FR, ARG_RELOC_ERR},
- {NO_ARG_RELOC, FR_TO_R, NO_ARG_RELOC, ARG_RELOC_ERR,
-    ARG_RELOC_ERR, ARG_RELOC_ERR},
- {ARG_RELOC_ERR, ARG_RELOC_ERR, ARG_RELOC_ERR, ARG_RELOC_ERR,
-    ARG_RELOC_ERR, ARG_RELOC_ERR},
- {NO_ARG_RELOC, FR_TO_R01, NO_ARG_RELOC, ARG_RELOC_ERR,
-    NO_ARG_RELOC, ARG_RELOC_ERR},
- {NO_ARG_RELOC, FR_TO_R23, NO_ARG_RELOC, ARG_RELOC_ERR,
-    ARG_RELOC_ERR, NO_ARG_RELOC},
-};
 
-/* Likewise for the return value.  */
-static CONST arg_reloc_type retval_mismatches[6][6] =
-{
- {NO_ARG_RELOC, NO_ARG_RELOC, NO_ARG_RELOC, NO_ARG_RELOC,
-    NO_ARG_RELOC, NO_ARG_RELOC},
- {NO_ARG_RELOC, NO_ARG_RELOC, FR_TO_R, ARG_RELOC_ERR,
-    FR_TO_R01, ARG_RELOC_ERR},
- {NO_ARG_RELOC, R_TO_FR, NO_ARG_RELOC, ARG_RELOC_ERR,
-    ARG_RELOC_ERR, ARG_RELOC_ERR},
- {ARG_RELOC_ERR, ARG_RELOC_ERR, ARG_RELOC_ERR, ARG_RELOC_ERR,
-    ARG_RELOC_ERR, ARG_RELOC_ERR},
- {NO_ARG_RELOC, R01_TO_FR, NO_ARG_RELOC, ARG_RELOC_ERR,
-    NO_ARG_RELOC, ARG_RELOC_ERR},
- {NO_ARG_RELOC, R23_TO_FR, NO_ARG_RELOC, ARG_RELOC_ERR,
-    ARG_RELOC_ERR, NO_ARG_RELOC},
-};
+  /* Offset within stub_sec of the beginning of this stub.  */
+  bfd_vma offset;
 
-/* Used for index mapping in symbol-extension sections.  */
-struct elf32_hppa_symextn_map_struct
-{
-  int old_index;
-  bfd *bfd;
-  asymbol *sym;
-  int new_index;
+  /* Given the symbol's value and its section we can determine its final
+     value when building the stubs (so the stub knows where to jump.  */
+  symvalue target_value;
+  asection *target_section;
 };
 
-static bfd_reloc_status_type hppa_elf_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+struct elf32_hppa_link_hash_table
+{
+  /* The main hash table.  */
+  struct elf_link_hash_table root;
 
-static unsigned long hppa_elf_relocate_insn 
-  PARAMS ((bfd *, asection *, unsigned long, unsigned long, long,
-          long, unsigned long, unsigned long, unsigned long));
+  /* The stub hash table.  */
+  struct bfd_hash_table stub_hash_table;
 
-static void hppa_elf_relocate_unwind_table
-  PARAMS ((bfd *, PTR, unsigned long, long, long,
-          unsigned long, unsigned long));
+  /* Current offsets in the stub sections.  */
+  bfd_vma *offset;
 
-static long get_symbol_value PARAMS ((asymbol *));
+  /* Global data pointer.  */
+  bfd_vma global_value;
+};
 
-static bfd_reloc_status_type hppa_elf_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd*, char **));
 
-static CONST reloc_howto_type * elf_hppa_reloc_type_lookup
-  PARAMS ((bfd_arch_info_type *, bfd_reloc_code_real_type));
+/* For linker stub hash tables.  */
 
-static symext_entryS elf32_hppa_get_sym_extn PARAMS ((bfd *, asymbol *, int));
+#define elf32_hppa_stub_hash_lookup(table, string, create, copy) \
+  ((struct elf32_hppa_stub_hash_entry *) \
+   bfd_hash_lookup ((table), (string), (create), (copy)))
 
-static elf32_hppa_stub_description * find_stubs PARAMS ((bfd *, asection *));
+/* Get the PA ELF linker hash table from a link_info structure.  */
 
-static elf32_hppa_stub_description * new_stub
-  PARAMS ((bfd *, asection *, struct bfd_link_info *));
+#define elf32_hppa_hash_table(p) \
+  ((struct elf32_hppa_link_hash_table *) ((p)->hash))
 
-static arg_reloc_type type_of_mismatch PARAMS ((int, int, int));
 
-static elf32_hppa_stub_name_list * find_stub_by_name
-  PARAMS ((bfd *, asection *, char *));
+static struct bfd_hash_entry *elf32_hppa_stub_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 
-static elf32_hppa_stub_name_list * add_stub_by_name
-  PARAMS ((bfd *, asection *, asymbol *, struct bfd_link_info *));
+static struct bfd_link_hash_table *elf32_hppa_link_hash_table_create
+  PARAMS ((bfd *));
 
-static void hppa_elf_stub_finish PARAMS ((bfd *));
+static char *elf32_hppa_stub_name
+  PARAMS ((const char *, const asection *, const asection *,
+          bfd_vma, const struct elf_link_hash_entry *));
 
-static void hppa_elf_stub_reloc
-  PARAMS ((elf32_hppa_stub_description *, bfd *, asymbol **, int,
-          elf32_hppa_reloc_type));
+static int elf32_hppa_relocate_insn
+  PARAMS ((int, bfd_vma, bfd_signed_vma, unsigned int, int,
+          enum hppa_reloc_field_selector_type_alt));
 
-static int hppa_elf_arg_reloc_needed_p
-  PARAMS ((bfd *, arelent *, arg_reloc_type [5], symext_entryS));
+static bfd_reloc_status_type elf32_hppa_bfd_final_link_relocate
+  PARAMS ((reloc_howto_type *, bfd *, asection *,
+          bfd_byte *, bfd_vma, bfd_vma, bfd_signed_vma,
+          struct bfd_link_info *, asection *, const char *,
+          struct elf_link_hash_entry *));
 
-static asymbol * hppa_elf_build_linker_stub
-  PARAMS ((bfd *, bfd *, struct bfd_link_info *, arelent *,
-          arg_reloc_type [5], int, unsigned *, hppa_stub_type));
+static boolean elf32_hppa_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
+          bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 
-static void hppa_elf_create_stub_sec 
-  PARAMS ((bfd *, bfd *, asection **, struct bfd_link_info *));
+static boolean elf32_hppa_add_symbol_hook
+  PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
+          const char **, flagword *, asection **, bfd_vma *));
 
-static int hppa_elf_long_branch_needed_p
-  PARAMS ((bfd *, asection *, arelent *, asymbol *, unsigned));
+static unsigned int elf32_hppa_size_of_stub
+  PARAMS ((asection *, bfd_vma, bfd_vma));
 
-static boolean hppa_elf_set_section_contents
-  PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
+static boolean elf32_hppa_build_one_stub
+  PARAMS ((struct bfd_hash_entry *, PTR));
 
-static void elf_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
 
-static void elf32_hppa_backend_symbol_processing PARAMS ((bfd *, asymbol *));
+/* Assorted hash table functions.  */
 
-static boolean elf32_hppa_backend_section_processing
-  PARAMS ((bfd *, Elf32_Internal_Shdr *));
+/* Initialize an entry in the stub hash table.  */
 
-static boolean elf32_hppa_backend_symbol_table_processing
-  PARAMS ((bfd *, elf_symbol_type *, int));
+static struct bfd_hash_entry *
+elf32_hppa_stub_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
+{
+  struct elf32_hppa_stub_hash_entry *ret;
 
-static boolean elf32_hppa_backend_section_from_shdr
-  PARAMS ((bfd *, Elf32_Internal_Shdr *, char *));
+  ret = (struct elf32_hppa_stub_hash_entry *) entry;
 
-static boolean elf32_hppa_backend_fake_sections
-  PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = ((struct elf32_hppa_stub_hash_entry *)
+          bfd_hash_allocate (table,
+                             sizeof (struct elf32_hppa_stub_hash_entry)));
+  if (ret == NULL)
+    return NULL;
 
-static boolean elf32_hppa_backend_section_from_bfd_section
-  PARAMS ((bfd *, Elf32_Internal_Shdr *, asection *, int *));
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elf32_hppa_stub_hash_entry *)
+        bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
 
-static boolean som_bfd_is_local_label PARAMS ((bfd *, asymbol *));
+  if (ret)
+    {
+      /* Initialize the local fields.  */
+      ret->stub_sec = NULL;
+      ret->offset = 0;
+      ret->target_value = 0;
+      ret->target_section = NULL;
+    }
 
-/* ELF/PA relocation howto entries.  */
+  return (struct bfd_hash_entry *) ret;
+}
 
-static reloc_howto_type elf_hppa_howto_table[ELF_HOWTO_TABLE_SIZE] =
-{
-  {R_HPPA_NONE, 0, 3, 19, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_NONE"},
-  {R_HPPA_32, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_32"},
-  {R_HPPA_11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_11"},
-  {R_HPPA_14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_14"},
-  {R_HPPA_17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_17"},
-{R_HPPA_L21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_L21"},
-{R_HPPA_R11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_R11"},
-{R_HPPA_R14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_R14"},
-{R_HPPA_R17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_R17"},
-  {R_HPPA_LS21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_LS21"},
-  {R_HPPA_RS11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_RS11"},
-  {R_HPPA_RS14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_RS14"},
-  {R_HPPA_RS17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_RS17"},
-  {R_HPPA_LD21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_LD21"},
-  {R_HPPA_RD11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_RD11"},
-  {R_HPPA_RD14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_RD14"},
-  {R_HPPA_RD17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_RD17"},
-  {R_HPPA_LR21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_LR21"},
-  {R_HPPA_RR14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_RR14"},
-  {R_HPPA_RR17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_RR17"},
-  {R_HPPA_GOTOFF_11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_11"},
-  {R_HPPA_GOTOFF_14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_14"},
-  {R_HPPA_GOTOFF_L21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_L21"},
-  {R_HPPA_GOTOFF_R11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_R11"},
-  {R_HPPA_GOTOFF_R14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_R14"},
-  {R_HPPA_GOTOFF_LS21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_LS21"},
-  {R_HPPA_GOTOFF_RS11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_RS11"},
-  {R_HPPA_GOTOFF_RS14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_RS14"},
-  {R_HPPA_GOTOFF_LD21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_LD21"},
-  {R_HPPA_GOTOFF_RD11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_RD11"},
-  {R_HPPA_GOTOFF_RD14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_RD14"},
-  {R_HPPA_GOTOFF_LR21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_LR21"},
-  {R_HPPA_GOTOFF_RR14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_GOTOFF_RR14"},
-  {R_HPPA_ABS_CALL_11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_11"},
-  {R_HPPA_ABS_CALL_14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_14"},
-  {R_HPPA_ABS_CALL_17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_17"},
-  {R_HPPA_ABS_CALL_L21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_L21"},
-  {R_HPPA_ABS_CALL_R11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_R11"},
-  {R_HPPA_ABS_CALL_R14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_R14"},
-  {R_HPPA_ABS_CALL_R17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_R17"},
-  {R_HPPA_ABS_CALL_LS21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_LS21"},
-  {R_HPPA_ABS_CALL_RS11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_RS11"},
-  {R_HPPA_ABS_CALL_RS14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_RS14"},
-  {R_HPPA_ABS_CALL_RS17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_RS17"},
-  {R_HPPA_ABS_CALL_LD21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_LD21"},
-  {R_HPPA_ABS_CALL_RD11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_RD11"},
-  {R_HPPA_ABS_CALL_RD14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_RD14"},
-  {R_HPPA_ABS_CALL_RD17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_RD17"},
-  {R_HPPA_ABS_CALL_LR21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_LR21"},
-  {R_HPPA_ABS_CALL_RR14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_RR14"},
-  {R_HPPA_ABS_CALL_RR17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ABS_CALL_RR17"},
-  {R_HPPA_PCREL_CALL_11, 0, 3, 11, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_11"},
-  {R_HPPA_PCREL_CALL_14, 0, 3, 14, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_14"},
-  {R_HPPA_PCREL_CALL_17, 0, 3, 17, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_17"},
-  {R_HPPA_PCREL_CALL_12, 0, 3, 12, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_12"},
-  {R_HPPA_PCREL_CALL_L21, 0, 3, 21, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_L21"},
-  {R_HPPA_PCREL_CALL_R11, 0, 3, 11, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_R11"},
-  {R_HPPA_PCREL_CALL_R14, 0, 3, 14, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_R14"},
-  {R_HPPA_PCREL_CALL_R17, 0, 3, 17, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_R17"},
-  {R_HPPA_PCREL_CALL_LS21, 0, 3, 21, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_LS21"},
-  {R_HPPA_PCREL_CALL_RS11, 0, 3, 11, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_RS11"},
-  {R_HPPA_PCREL_CALL_RS14, 0, 3, 14, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_RS14"},
-  {R_HPPA_PCREL_CALL_RS17, 0, 3, 17, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_RS17"},
-  {R_HPPA_PCREL_CALL_LD21, 0, 3, 21, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_LD21"},
-  {R_HPPA_PCREL_CALL_RD11, 0, 3, 11, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_RD11"},
-  {R_HPPA_PCREL_CALL_RD14, 0, 3, 14, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_RD14"},
-  {R_HPPA_PCREL_CALL_RD17, 0, 3, 17, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_RD17"},
-  {R_HPPA_PCREL_CALL_LR21, 0, 3, 21, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_LR21"},
-  {R_HPPA_PCREL_CALL_RR14, 0, 3, 14, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_RR14"},
-  {R_HPPA_PCREL_CALL_RR17, 0, 3, 17, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PCREL_CALL_RR17"},
-  {R_HPPA_PLABEL_32, 0, 3, 32, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PLABEL_32"},
-  {R_HPPA_PLABEL_11, 0, 3, 11, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PLABEL_11"},
-  {R_HPPA_PLABEL_14, 0, 3, 14, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PLABEL_14"},
-  {R_HPPA_PLABEL_L21, 0, 3, 21, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PLABEL_L21"},
-  {R_HPPA_PLABEL_R11, 0, 3, 11, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PLABEL_R11"},
-  {R_HPPA_PLABEL_R14, 0, 3, 14, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_PLABEL_R14"},
-  {R_HPPA_DLT_32, 0, 3, 32, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_DLT_32"},
-  {R_HPPA_DLT_11, 0, 3, 11, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_DLT_11"},
-  {R_HPPA_DLT_14, 0, 3, 14, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_DLT_14"},
-  {R_HPPA_DLT_L21, 0, 3, 21, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_DLT_L21"},
-  {R_HPPA_DLT_R11, 0, 3, 11, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_DLT_R11"},
-  {R_HPPA_DLT_R14, 0, 3, 14, false, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_DLT_R14"},
-  {R_HPPA_UNWIND_ENTRY, 0, 3, 32, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_UNWIND_ENTRY"},
-  {R_HPPA_UNWIND_ENTRIES, 0, 3, 32, true, 0, complain_overflow_signed, hppa_elf_reloc, "R_HPPA_UNWIND_ENTRIES"},
-  {R_HPPA_PUSH_CONST, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_PUSH_CONST"},
-  {R_HPPA_PUSH_PC, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_PUSH_PC"},
-  {R_HPPA_PUSH_SYM, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_PUSH_SYM"},
-  {R_HPPA_PUSH_GOTOFF, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_PUSH_GOTOFF"},
-  {R_HPPA_PUSH_ABS_CALL, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_PUSH_ABS_CALL"},
-  {R_HPPA_PUSH_PCREL_CALL, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_PUSH_PCREL_CALL"},
-  {R_HPPA_PUSH_PLABEL, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_PUSH_PLABEL"},
-{R_HPPA_MAX, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_MAX"},
-{R_HPPA_MIN, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_MIN"},
-{R_HPPA_ADD, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ADD"},
-{R_HPPA_SUB, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_SUB"},
-  {R_HPPA_MULT, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_MULT"},
-{R_HPPA_DIV, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_DIV"},
-{R_HPPA_MOD, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_MOD"},
-{R_HPPA_AND, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_AND"},
-  {R_HPPA_OR, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_OR"},
-{R_HPPA_XOR, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_XOR"},
-{R_HPPA_NOT, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_NOT"},
-  {R_HPPA_LSHIFT, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_LSHIFT"},
-  {R_HPPA_ARITH_RSHIFT, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_ARITH_RSHIFT"},
-  {R_HPPA_LOGIC_RSHIFT, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_LOGIC_RSHIFT"},
-{R_HPPA_EXPR_F, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_L"},
-  {R_HPPA_EXPR_L, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_L"},
-  {R_HPPA_EXPR_R, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_R"},
-  {R_HPPA_EXPR_LS, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_LS"},
-  {R_HPPA_EXPR_RS, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_RS"},
-  {R_HPPA_EXPR_LD, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_LD"},
-  {R_HPPA_EXPR_RD, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_RD"},
-  {R_HPPA_EXPR_LR, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_LR"},
-  {R_HPPA_EXPR_RR, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_RR"},
-  {R_HPPA_EXPR_32, 0, 3, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_32"},
-  {R_HPPA_EXPR_21, 0, 3, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_21"},
-  {R_HPPA_EXPR_11, 0, 3, 11, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_11"},
-  {R_HPPA_EXPR_14, 0, 3, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_14"},
-  {R_HPPA_EXPR_17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_17"},
-  {R_HPPA_EXPR_12, 0, 3, 12, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_EXPR_12"},
-  {R_HPPA_STUB_CALL_17, 0, 3, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_HPPA_STUB_CALL_17"},
-  {R_HPPA_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont, NULL, "R_HPPA_UNIMPLEMENTED"},
-};
+/* Create the derived linker hash table.  The PA ELF port uses the derived
+   hash table to keep information specific to the PA ELF linker (without
+   using static variables).  */
 
-static symext_chainS *symext_rootP;
-static symext_chainS *symext_lastP;
-static boolean symext_chain_built;
-static long global_value;
-static long GOT_value;
-static asymbol *global_symbol;
-static int global_sym_defined;
-static symext_entryS *symextn_contents;
-static unsigned int symextn_contents_real_size;
-static elf32_hppa_stub_description *elf_hppa_stub_rootP;
-static boolean stubs_finished = false;
-static struct elf32_hppa_symextn_map_struct *elf32_hppa_symextn_map;
-static int elf32_hppa_symextn_map_size;
-
-static char *linker_stubs = NULL;
-static int linker_stubs_size = 0;
-static int linker_stubs_max_size = 0;
-#define STUB_ALLOC_INCR        100
-#define STUB_SYM_BUFFER_INC    5
-
-/* Relocate the given INSN given the various input parameters.
-
-   FIXME: endianness and sizeof (long) issues abound here.  */
-
-static unsigned long
-hppa_elf_relocate_insn (abfd, input_sect, insn, address, sym_value,
-                       r_addend, r_format, r_field, pcrel)
+static struct bfd_link_hash_table *
+elf32_hppa_link_hash_table_create (abfd)
      bfd *abfd;
-     asection *input_sect;
-     unsigned long insn;
-     unsigned long address;
-     long sym_value;
-     long r_addend;
-     unsigned long r_format;
-     unsigned long r_field;
-     unsigned long pcrel;
 {
-  unsigned char opcode = get_opcode (insn);
-  long constant_value;
-  unsigned arg_reloc;
+  struct elf32_hppa_link_hash_table *ret;
 
-  switch (opcode)
-    {
-    case LDO:
-    case LDB:
-    case LDH:
-    case LDW:
-    case LDWM:
-    case STB:
-    case STH:
-    case STW:
-    case STWM:
-    case COMICLR:
-    case SUBI:
-    case ADDIT:
-    case ADDI:
-    case LDIL:
-    case ADDIL:
-      constant_value = HPPA_R_CONSTANT (r_addend);
-
-      if (pcrel)
-       sym_value -= address;
-
-      sym_value = hppa_field_adjust (sym_value, constant_value, r_field);
-      return hppa_rebuild_insn (abfd, insn, sym_value, r_format);
-
-    case BL:
-    case BE:
-    case BLE:
-      arg_reloc = HPPA_R_ARG_RELOC (r_addend);
-
-      /* XXX computing constant_value is not needed??? */
-      constant_value = assemble_17 ((insn & 0x001f0000) >> 16,
-                                   (insn & 0x00001ffc) >> 2,
-                                   insn & 1);
-
-      constant_value = (constant_value << 15) >> 15;
-      if (pcrel)
-       {
-         sym_value -=
-           address + input_sect->output_offset
-           + input_sect->output_section->vma;
-         sym_value = hppa_field_adjust (sym_value, -8, r_field);
-       }
-      else
-       sym_value = hppa_field_adjust (sym_value, constant_value, r_field);
+  ret = ((struct elf32_hppa_link_hash_table *) bfd_alloc (abfd, sizeof (*ret)));
+  if (ret == NULL)
+    return NULL;
 
-      return hppa_rebuild_insn (abfd, insn, sym_value >> 2, r_format);
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+                                     _bfd_elf_link_hash_newfunc))
+    {
+      bfd_release (abfd, ret);
+      return NULL;
+    }
 
-    default:
-      if (opcode == 0)
-       {
-         constant_value = HPPA_R_CONSTANT (r_addend);
+  /* Init the stub hash table too.  */
+  if (!bfd_hash_table_init (&ret->stub_hash_table,
+                           elf32_hppa_stub_hash_newfunc))
+    return NULL;
 
-         if (pcrel)
-           sym_value -= address;
+  ret->offset = NULL;
+  ret->global_value = 0;
 
-         return hppa_field_adjust (sym_value, constant_value, r_field);
-       }
-      else
-       abort ();
-    }
+  return &ret->root.root;
 }
 
-/* Relocate a single unwind entry, or an entire table of them.  */
-
-static void
-hppa_elf_relocate_unwind_table (abfd, data, address, sym_value,
-                               r_addend, r_type, r_field)
-     bfd *abfd;
-     PTR data;
-     unsigned long address;
-     long sym_value;
-     long r_addend;
-     unsigned long r_type;
-     unsigned long r_field;
+/* Build a name for a long branch stub.  */
+static char *
+elf32_hppa_stub_name (sym_name, sym_sec, input_section, addend, hash)
+     const char *sym_name;
+     const asection *sym_sec;
+     const asection *input_section;
+     bfd_vma addend;
+     const struct elf_link_hash_entry *hash;
 {
-  bfd_byte *hit_data = address + (bfd_byte *) data;
-  long start_offset;
-  long end_offset;
-  long relocated_value;
-  int i;
-
-  switch (r_type)
-    {
-    case R_HPPA_UNWIND_ENTRY:
-      /* Need to relocate the first two 32bit fields in the unwind.  They
-        correspond to a function's start and end address.  */
-      start_offset = bfd_get_32 (abfd, hit_data);
-      relocated_value = hppa_field_adjust (sym_value, start_offset, r_field);
-      bfd_put_32 (abfd, relocated_value, hit_data);
-
-      hit_data += sizeof (unsigned long);
-      end_offset = bfd_get_32 (abfd, hit_data);
-      relocated_value = hppa_field_adjust (sym_value, end_offset, r_field);
-      bfd_put_32 (abfd, relocated_value, hit_data);
-      break;
+  char *stub_name;
+  int len;
 
-    case R_HPPA_UNWIND_ENTRIES:
-      /* Relocate a mass of unwind entires.  The count is passed in r_addend
-        (who's braindamaged idea was this anyway?  */
-      for (i = 0; i < r_addend; i++, hit_data += 3 * sizeof (unsigned long))
-       {
-         unsigned int adjustment;
-         /* Adjust the first 32bit field in the unwind entry.  It's
-            the starting offset of a function.  */
-         start_offset = bfd_get_32 (abfd, hit_data);
-         bfd_put_32 (abfd, sym_value, hit_data);
-         adjustment = sym_value - start_offset;
-
-         /* Now adjust the second 32bit field, it's the ending offset
-            of a function.  */
-         hit_data += sizeof (unsigned long);
-         end_offset = adjustment + bfd_get_32 (abfd, hit_data);
-         bfd_put_32 (abfd, end_offset, hit_data);
-
-         /* Prepare for the next iteration.  */
-         start_offset = bfd_get_32 (abfd, 
-                                    hit_data + 3 * sizeof (unsigned long));
-         sym_value = start_offset + adjustment;
-       }
-      break;
+  len = strlen (sym_name) + 19;
+  if (hash == NULL)
+    len += 9;
 
-    default:
-      abort ();
+  stub_name = bfd_malloc (len);
+  if (stub_name != NULL)
+    {
+      sprintf (stub_name, "%08x_%08x_%s",
+              input_section->id & 0xffffffff,
+              (int) addend & 0xffffffff,
+              sym_name);
+
+      /* Tack on an ID so we can uniquely identify
+        this local symbol in the stub hash tables.  */
+      if (hash == NULL)
+       sprintf (stub_name + len - 10, "_%08x",
+                sym_sec->id & 0xffffffff);
     }
+  return stub_name;
 }
 
-/* Return the relocated value of the given symbol.  */
-
-static long
-get_symbol_value (symbol)
-     asymbol *symbol;
-{
-  if (symbol == NULL
-      || symbol->section == &bfd_com_section)
-    return 0;
-  else
-    return symbol->value + symbol->section->output_section->vma
-      + symbol->section->output_offset;
-}
-
-/* Return one (or more) BFD relocations which implement the base
-   relocation with modifications based on format and field.  */
+/* Relocate the given INSN given the various input parameters.  */
 
-elf32_hppa_reloc_type **
-hppa_elf_gen_reloc_type (abfd, base_type, format, field)
-     bfd *abfd;
-     elf32_hppa_reloc_type base_type;
-     int format;
-     int field;
+static int
+elf32_hppa_relocate_insn (insn, sym_value, r_addend, r_type, r_format, r_field)
+     int insn;
+     bfd_vma sym_value;
+     bfd_signed_vma r_addend;
+     unsigned int r_type;
+     int r_format;
+     enum hppa_reloc_field_selector_type_alt r_field;
 {
-  elf32_hppa_reloc_type *finaltype;
-  elf32_hppa_reloc_type **final_types;
-
-  /* Allocate slots for the BFD relocation.  */
-  final_types = (elf32_hppa_reloc_type **)
-    bfd_alloc_by_size_t (abfd, sizeof (elf32_hppa_reloc_type *) * 2);
-  BFD_ASSERT (final_types != 0); /* FIXME */
-
-  /* Allocate space for the relocation itself.  */
-  finaltype = (elf32_hppa_reloc_type *)
-    bfd_alloc_by_size_t (abfd, sizeof (elf32_hppa_reloc_type));
-  BFD_ASSERT (finaltype != 0); /* FIXME */
+  int value;
+#ifdef ELF_ARG_RELOC
+#ifndef ELF_ARG_RELOC_INSN
+  /* Ick.  Who would want to support this?  */
+  int imm;
 
-  /* Some reasonable defaults.  */
-  final_types[0] = finaltype;
-  final_types[1] = NULL;
-
-#define final_type finaltype[0]
-
-  final_type = base_type;
-
-  /* Just a tangle of nested switch statements to deal with the braindamage
-     that a different field selector means a completely different relocation
-     for PA ELF.  */
-  switch (base_type)
+  switch (r_type)
     {
-    case R_HPPA:
-      switch (format)
-       {
-       case 11:
-         switch (field)
-           {
-           case e_fsel:
-             final_type = R_HPPA_11;
-             break;
-           case e_rsel:
-             final_type = R_HPPA_R11;
-             break;
-           case e_rssel:
-             final_type = R_HPPA_RS11;
-             break;
-           case e_rdsel:
-             final_type = R_HPPA_RD11;
-             break;
-           case e_psel:
-             final_type = R_HPPA_PLABEL_11;
-             break;
-           case e_rpsel:
-             final_type = R_HPPA_PLABEL_R11;
-             break;
-           case e_tsel:
-             final_type = R_HPPA_DLT_11;
-             break;
-           case e_rtsel:
-             final_type = R_HPPA_DLT_R11;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 14:
-         switch (field)
-           {
-           case e_rsel:
-             final_type = R_HPPA_R14;
-             break;
-           case e_rssel:
-             final_type = R_HPPA_RS14;
-             break;
-           case e_rdsel:
-             final_type = R_HPPA_RD14;
-             break;
-           case e_rrsel:
-             final_type = R_HPPA_RR14;
-             break;
-           case e_psel:
-             final_type = R_HPPA_PLABEL_14;
-             break;
-           case e_rpsel:
-             final_type = R_HPPA_PLABEL_R14;
-             break;
-           case e_tsel:
-             final_type = R_HPPA_DLT_14;
-             break;
-           case e_rtsel:
-             final_type = R_HPPA_DLT_R14;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 17:
-         switch (field)
-           {
-           case e_fsel:
-             final_type = R_HPPA_17;
-             break;
-           case e_rsel:
-             final_type = R_HPPA_R17;
-             break;
-           case e_rssel:
-             final_type = R_HPPA_RS17;
-             break;
-           case e_rdsel:
-             final_type = R_HPPA_RD17;
-             break;
-           case e_rrsel:
-             final_type = R_HPPA_RR17;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 21:
-         switch (field)
-           {
-           case e_lsel:
-             final_type = R_HPPA_L21;
-             break;
-           case e_lssel:
-             final_type = R_HPPA_LS21;
-             break;
-           case e_ldsel:
-             final_type = R_HPPA_LD21;
-             break;
-           case e_lrsel:
-             final_type = R_HPPA_LR21;
-             break;
-           case e_lpsel:
-             final_type = R_HPPA_PLABEL_L21;
-             break;
-           case e_ltsel:
-             final_type = R_HPPA_PLABEL_L21;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 32:
-         switch (field)
-           {
-           case e_fsel:
-             final_type = R_HPPA_32;
-             break;
-           case e_psel:
-             final_type = R_HPPA_PLABEL_32;
-             break;
-           case e_tsel:
-             final_type = R_HPPA_DLT_32;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       default:
-         abort ();
-         break;
-       }
+      /* The offset is partly stored in the instruction for cases
+        where the top ten bits of the addend are used for arg_reloc.
+         This is a little tricky, because the immediate value in the
+        instruction not only needs to be pieced together from
+        multiple bit fields, but also needs to be shifted left to
+        restore the original quantity.  Which bits of the offset
+        we can retrieve from the instruction depend on exactly which
+        instruction we are dealing with.  */
+    case R_PARISC_PCREL17R:
+    case R_PARISC_PCREL17F:
+    case R_PARISC_PCREL17C:
+    case R_PARISC_DIR17R:
+    case R_PARISC_DIR17F:
+      /* For these relocs, we choose to use the low 10 bits from the
+        instruction and store the high 22 bits in the reloc addend.
+        It doesn't matter that the bottom 2 bits of the value are
+        always zero, as branches must be to a location which is a
+        multiple of 4.  */
+#if 0
+      /* It isn't necessary to retrieve the whole immediate, but
+        this documents what we have in the instruction.  */
+      imm = (((insn & 0x1f0000) >> 5)
+            | ((insn & 0x0004) << 8)
+            | ((insn & 0x1ff8) >> 3)) - ((insn & 1) << 17);
+      imm <<= 2;
+      imm = imm & 0x3ff;
+#else
+      imm = (insn & 0x7f8) >> 1;
+#endif
+      r_addend = (r_addend << (BFD_ARCH_SIZE-22)) >> (BFD_ARCH_SIZE-32);
+      r_addend = r_addend | imm;
       break;
 
-
-    case R_HPPA_GOTOFF:
-      switch (format)
-       {
-       case 11:
-         switch (field)
-           {
-           case e_rsel:
-             final_type = R_HPPA_GOTOFF_R11;
-             break;
-           case e_rssel:
-             final_type = R_HPPA_GOTOFF_RS11;
-             break;
-           case e_rdsel:
-             final_type = R_HPPA_GOTOFF_RD11;
-             break;
-           case e_fsel:
-             final_type = R_HPPA_GOTOFF_11;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 14:
-         switch (field)
-           {
-           case e_rsel:
-             final_type = R_HPPA_GOTOFF_R14;
-             break;
-           case e_rssel:
-             final_type = R_HPPA_GOTOFF_RS14;
-             break;
-           case e_rdsel:
-             final_type = R_HPPA_GOTOFF_RD14;
-             break;
-           case e_rrsel:
-             final_type = R_HPPA_GOTOFF_RR14;
-             break;
-           case e_fsel:
-             final_type = R_HPPA_GOTOFF_14;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 21:
-         switch (field)
-           {
-           case e_lsel:
-             final_type = R_HPPA_GOTOFF_L21;
-             break;
-           case e_lssel:
-             final_type = R_HPPA_GOTOFF_LS21;
-             break;
-           case e_ldsel:
-             final_type = R_HPPA_GOTOFF_LD21;
-             break;
-           case e_lrsel:
-             final_type = R_HPPA_GOTOFF_LR21;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       default:
-         abort ();
-         break;
-       }
+    case R_PARISC_PCREL21L:
+    case R_PARISC_DIR21L:
+      /* In this case, the instruction stores the high 21 bits of the
+        value, so we pick off the top 10 bits, and use the reloc
+        addend to store the low 22 bits.  */
+#if 0
+      /* It isn't necessary to retrieve the whole immediate, but
+        this documents what we have in the instruction.  */
+      imm = ((  (insn & 0x000ffe) << 8)
+            | ((insn & 0x00c000) >> 7)
+            | ((insn & 0x1f0000) >> 14)
+            | ((insn & 0x003000) >> 12)) - ((insn & 1) << 20);
+      imm <<= 11;
+      imm = imm & ~ 0x3fffff;
+#else
+      /* Just pick off the 10 needed bits, ensuring we sign extend.  */
+      imm = ((insn & 0x000ff8) << 19) - ((insn & 1) << 31);
+#endif
+      r_addend = imm | (r_addend & 0x3fffff);
       break;
 
-
-    case R_HPPA_PCREL_CALL:
-      switch (format)
-       {
-       case 11:
-         switch (field)
-           {
-           case e_rsel:
-             final_type = R_HPPA_PCREL_CALL_R11;
-             break;
-           case e_rssel:
-             final_type = R_HPPA_PCREL_CALL_RS11;
-             break;
-           case e_rdsel:
-             final_type = R_HPPA_PCREL_CALL_RD11;
-             break;
-           case e_fsel:
-             final_type = R_HPPA_PCREL_CALL_11;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 14:
-         switch (field)
-           {
-           case e_rsel:
-             final_type = R_HPPA_PCREL_CALL_R14;
-             break;
-           case e_rssel:
-             final_type = R_HPPA_PCREL_CALL_RS14;
-             break;
-           case e_rdsel:
-             final_type = R_HPPA_PCREL_CALL_RD14;
-             break;
-           case e_rrsel:
-             final_type = R_HPPA_PCREL_CALL_RR14;
-             break;
-           case e_fsel:
-             final_type = R_HPPA_PCREL_CALL_14;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 17:
-         switch (field)
-           {
-           case e_rsel:
-             final_type = R_HPPA_PCREL_CALL_R17;
-             break;
-           case e_rssel:
-             final_type = R_HPPA_PCREL_CALL_RS17;
-             break;
-           case e_rdsel:
-             final_type = R_HPPA_PCREL_CALL_RD17;
-             break;
-           case e_rrsel:
-             final_type = R_HPPA_PCREL_CALL_RR17;
-             break;
-           case e_fsel:
-             final_type = R_HPPA_PCREL_CALL_17;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 21:
-         switch (field)
-           {
-           case e_lsel:
-             final_type = R_HPPA_PCREL_CALL_L21;
-             break;
-           case e_lssel:
-             final_type = R_HPPA_PCREL_CALL_LS21;
-             break;
-           case e_ldsel:
-             final_type = R_HPPA_PCREL_CALL_LD21;
-             break;
-           case e_lrsel:
-             final_type = R_HPPA_PCREL_CALL_LR21;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       default:
-         abort ();
-         break;
-       }
+    default:
       break;
+    }
+#endif
+#endif
 
-
-    case R_HPPA_PLABEL:
-      switch (format)
-       {
-       case 11:
-         switch (field)
-           {
-           case e_fsel:
-             final_type = R_HPPA_PLABEL_11;
-             break;
-           case e_rsel:
-             final_type = R_HPPA_PLABEL_R11;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 14:
-         switch (field)
-           {
-           case e_fsel:
-             final_type = R_HPPA_PLABEL_14;
-             break;
-           case e_rsel:
-             final_type = R_HPPA_PLABEL_R14;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 21:
-         switch (field)
-           {
-           case e_lsel:
-             final_type = R_HPPA_PLABEL_L21;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 32:
-         switch (field)
-           {
-           case e_fsel:
-             final_type = R_HPPA_PLABEL_32;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       default:
-         abort ();
-         break;
-       }
-
-
-    case R_HPPA_ABS_CALL:
-      switch (format)
-       {
-       case 11:
-         switch (field)
-           {
-           case e_rsel:
-             final_type = R_HPPA_ABS_CALL_R11;
-             break;
-           case e_rssel:
-             final_type = R_HPPA_ABS_CALL_RS11;
-             break;
-           case e_rdsel:
-             final_type = R_HPPA_ABS_CALL_RD11;
-             break;
-           case e_fsel:
-             final_type = R_HPPA_ABS_CALL_11;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 14:
-         switch (field)
-           {
-           case e_rsel:
-             final_type = R_HPPA_ABS_CALL_R14;
-             break;
-           case e_rssel:
-             final_type = R_HPPA_ABS_CALL_RS14;
-             break;
-           case e_rdsel:
-             final_type = R_HPPA_ABS_CALL_RD14;
-             break;
-           case e_rrsel:
-             final_type = R_HPPA_ABS_CALL_RR14;
-             break;
-           case e_fsel:
-             final_type = R_HPPA_ABS_CALL_14;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 17:
-         switch (field)
-           {
-           case e_rsel:
-             final_type = R_HPPA_ABS_CALL_R17;
-             break;
-           case e_rssel:
-             final_type = R_HPPA_ABS_CALL_RS17;
-             break;
-           case e_rdsel:
-             final_type = R_HPPA_ABS_CALL_RD17;
-             break;
-           case e_rrsel:
-             final_type = R_HPPA_ABS_CALL_RR17;
-             break;
-           case e_fsel:
-             final_type = R_HPPA_ABS_CALL_17;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       case 21:
-         switch (field)
-           {
-           case e_lsel:
-             final_type = R_HPPA_ABS_CALL_L21;
-             break;
-           case e_lssel:
-             final_type = R_HPPA_ABS_CALL_LS21;
-             break;
-           case e_ldsel:
-             final_type = R_HPPA_ABS_CALL_LD21;
-             break;
-           case e_lrsel:
-             final_type = R_HPPA_ABS_CALL_LR21;
-             break;
-           default:
-             abort ();
-             break;
-           }
-         break;
-
-       default:
-         abort ();
-         break;
-       }
+  switch (r_type)
+    {
+    case R_PARISC_PCREL21L:
+    case R_PARISC_PCREL17C:
+    case R_PARISC_PCREL17F:
+    case R_PARISC_PCREL17R:
+    case R_PARISC_PCREL14R:
+      /* Adjust PC relative offset.  */
+      r_addend -= 8;
       break;
-
-
-    case R_HPPA_UNWIND:
-      final_type = R_HPPA_UNWIND_ENTRY;
+    default:
       break;
+    }
+  value = hppa_field_adjust (sym_value, r_addend, r_field);
 
-
-    case R_HPPA_COMPLEX:
-    case R_HPPA_COMPLEX_PCREL_CALL:
-    case R_HPPA_COMPLEX_ABS_CALL:
-      /* The code originally here was horribly broken, and apparently
-        never used.  Zap it.  When we need complex relocations rewrite
-        it correctly!  */
-      abort ();
+  switch (r_type)
+    {
+    case R_PARISC_PCREL17C:
+    case R_PARISC_PCREL17F:
+    case R_PARISC_PCREL17R:
+    case R_PARISC_DIR17F:
+    case R_PARISC_DIR17R:
+      /* This is a branch.  Divide the offset by four.
+        Note that we need to decide whether it's a branch or
+        otherwise by inspecting the reloc.  Inspecting insn won't
+        work as insn might be from a .word directive.  */
+      value >>= 2;
       break;
-      
+
     default:
-      final_type = base_type;
       break;
     }
 
-  return final_types;
+  return hppa_rebuild_insn (insn, value, r_format);
 }
 
-#undef final_type
-
-
-/* Actually perform a relocation.  */
+/* Actually perform a relocation as part of a final link.  This can get
+   rather hairy when linker stubs are needed.  */
 
 static bfd_reloc_status_type
-hppa_elf_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
-               error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
+elf32_hppa_bfd_final_link_relocate (howto, input_bfd, input_section,
+                                   contents, offset, value, addend,
+                                   info, sym_sec, sym_name, h)
+     reloc_howto_type *howto;
+     bfd *input_bfd;
      asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
+     bfd_byte *contents;
+     bfd_vma offset;
+     bfd_vma value;
+     bfd_signed_vma addend;
+     struct bfd_link_info *info;
+     asection *sym_sec;
+     const char *sym_name;
+     struct elf_link_hash_entry *h;
 {
-  unsigned long insn;
-  long sym_value = 0;
-  unsigned long addr = reloc_entry->address;
-  bfd_byte *hit_data = addr + (bfd_byte *) data;
-  unsigned long r_type = reloc_entry->howto->type;
-  unsigned long r_field = e_fsel;
-  boolean r_pcrel = reloc_entry->howto->pc_relative;
-  unsigned r_format = reloc_entry->howto->bitsize;
-  long r_addend = reloc_entry->addend;
-
-  /* If only performing a partial link, get out early.  */
-  if (output_bfd)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
+  int insn;
+  unsigned int r_type = howto->type;
+  int r_format = howto->bitsize;
+  enum hppa_reloc_field_selector_type_alt r_field = e_fsel;
+  bfd_byte *hit_data = contents + offset;
+  bfd_vma location;
 
-  /* If performing final link and the symbol we're relocating against
-     is undefined, then return an error.  */ 
-  if (symbol_in && symbol_in->section == &bfd_und_section)
-    return bfd_reloc_undefined;
+  if (r_type == R_PARISC_NONE)
+    return bfd_reloc_ok;
 
-  /* Get the final relocated value.  */
-  sym_value = get_symbol_value (symbol_in);
+  insn = bfd_get_32 (input_bfd, hit_data);
 
-  /* Compute the value of $global$.
-     FIXME: None of this should be necessary.  $global$ is just a 
-     marker and shouldn't really figure into these computations.
+  /* Find out where we are and where we're going.  */
+  location = (offset +
+             input_section->output_offset +
+             input_section->output_section->vma);
 
-     Once that's fixed we'll need to teach this backend to change
-     DP-relative relocations involving symbols in the text section
-     to be simple absolute relocations.  */
-  if (!global_sym_defined)
+  switch (r_type)
     {
-      if (global_symbol)
-       {
-         global_value = (global_symbol->value
-                         + global_symbol->section->output_section->vma
-                         + global_symbol->section->output_offset);
-         GOT_value = global_value;
-         global_sym_defined++;
-       }
+    case R_PARISC_PCREL21L:
+    case R_PARISC_PCREL17C:
+    case R_PARISC_PCREL17F:
+    case R_PARISC_PCREL17R:
+    case R_PARISC_PCREL14R:
+      /* Make it a pc relative offset.  */
+      value -= location;
+      break;
+    default:
+      break;
     }
 
-  /* Get the instruction word.  */
-  insn = bfd_get_32 (abfd, hit_data);
-
-  /* Relocate the value based on one of the basic relocation types
-
-   basic_type_1:       relocation is relative to $global$
-   basic_type_2:       relocation is relative to the current GOT
-   basic_type_3:       relocation is an absolute call
-   basic_type_4:       relocation is an PC-relative call
-   basic_type_5:       relocation is plabel reference
-   basic_type_6:       relocation is an unwind table relocation
-   extended_type:      unimplemented  */
-
   switch (r_type)
     {
-    case R_HPPA_NONE:
-      break;
-
-    /* Handle all the basic type 1 relocations.  */
-    case R_HPPA_32:
-    case R_HPPA_11:
-    case R_HPPA_14:
-    case R_HPPA_17:
+    case R_PARISC_DIR32:
+    case R_PARISC_DIR17F:
+    case R_PARISC_PCREL17C:
       r_field = e_fsel;
-      goto do_basic_type_1;
-    case R_HPPA_L21:
-      r_field = e_lsel;
-      goto do_basic_type_1;
-    case R_HPPA_R11:
-    case R_HPPA_R14:
-    case R_HPPA_R17:
-      r_field = e_rsel;
-      goto do_basic_type_1;
-    case R_HPPA_LS21:
-      r_field = e_lssel;
-      goto do_basic_type_1;
-    case R_HPPA_RS11:
-    case R_HPPA_RS14:
-    case R_HPPA_RS17:
-      r_field = e_ldsel;
-      goto do_basic_type_1;
-    case R_HPPA_LD21:
-      r_field = e_ldsel;
-      goto do_basic_type_1;
-    case R_HPPA_RD11:
-    case R_HPPA_RD14:
-    case R_HPPA_RD17:
-      r_field = e_rdsel;
-      goto do_basic_type_1;
-    case R_HPPA_LR21:
-      r_field = e_lrsel;
-      goto do_basic_type_1;
-    case R_HPPA_RR14:
-    case R_HPPA_RR17:
-      r_field = e_rrsel;
-
-    do_basic_type_1:
-      insn = hppa_elf_relocate_insn (abfd, input_section, insn, addr,
-                                    sym_value, r_addend, r_format,
-                                    r_field, r_pcrel);
       break;
 
-    /* Handle all the basic type 2 relocations.  */
-    case R_HPPA_GOTOFF_11:
-    case R_HPPA_GOTOFF_14:
-      r_field = e_fsel;
-      goto do_basic_type_2;
-    case R_HPPA_GOTOFF_L21:
-      r_field = e_lsel;
-      goto do_basic_type_2;
-    case R_HPPA_GOTOFF_R11:
-    case R_HPPA_GOTOFF_R14:
-      r_field = e_rsel;
-      goto do_basic_type_2;
-    case R_HPPA_GOTOFF_LS21:
-      r_field = e_lssel;
-      goto do_basic_type_2;
-    case R_HPPA_GOTOFF_RS11:
-    case R_HPPA_GOTOFF_RS14:
-      r_field = e_rssel;
-      goto do_basic_type_2;
-    case R_HPPA_GOTOFF_LD21:
-      r_field = e_ldsel;
-      goto do_basic_type_2;
-    case R_HPPA_GOTOFF_RD11:
-    case R_HPPA_GOTOFF_RD14:
-      r_field = e_rdsel;
-      goto do_basic_type_2;
-    case R_HPPA_GOTOFF_LR21:
+    case R_PARISC_DIR21L:
+    case R_PARISC_PCREL21L:
       r_field = e_lrsel;
-      goto do_basic_type_2;
-    case R_HPPA_GOTOFF_RR14:
-      r_field = e_rrsel;
-
-    do_basic_type_2:
-      sym_value -= GOT_value;
-      insn = hppa_elf_relocate_insn (abfd, input_section, insn, addr,
-                                    sym_value, r_addend, r_format,
-                                    r_field, r_pcrel);
       break;
 
-    /* Handle all the basic type 3 relocations.  */
-    case R_HPPA_ABS_CALL_11:
-    case R_HPPA_ABS_CALL_14:
-    case R_HPPA_ABS_CALL_17:
-      r_field = e_fsel;
-      goto do_basic_type_3;
-    case R_HPPA_ABS_CALL_L21:
-      r_field = e_lsel;
-      goto do_basic_type_3;
-    case R_HPPA_ABS_CALL_R11:
-    case R_HPPA_ABS_CALL_R14:
-    case R_HPPA_ABS_CALL_R17:
-      r_field = e_rsel;
-      goto do_basic_type_3;
-    case R_HPPA_ABS_CALL_LS21:
-      r_field = e_lssel;
-      goto do_basic_type_3;
-    case R_HPPA_ABS_CALL_RS11:
-    case R_HPPA_ABS_CALL_RS14:
-    case R_HPPA_ABS_CALL_RS17:
-      r_field = e_rssel;
-      goto do_basic_type_3;
-    case R_HPPA_ABS_CALL_LD21:
-      r_field = e_ldsel;
-      goto do_basic_type_3;
-    case R_HPPA_ABS_CALL_RD11:
-    case R_HPPA_ABS_CALL_RD14:
-    case R_HPPA_ABS_CALL_RD17:
-      r_field = e_rdsel;
-      goto do_basic_type_3;
-    case R_HPPA_ABS_CALL_LR21:
-      r_field = e_lrsel;
-      goto do_basic_type_3;
-    case R_HPPA_ABS_CALL_RR14:
-    case R_HPPA_ABS_CALL_RR17:
+    case R_PARISC_DIR17R:
+    case R_PARISC_PCREL17R:
+    case R_PARISC_DIR14R:
+    case R_PARISC_PCREL14R:
       r_field = e_rrsel;
-
-    do_basic_type_3:
-      insn = hppa_elf_relocate_insn (abfd, input_section, insn, addr,
-                                    sym_value, r_addend, r_format,
-                                    r_field, r_pcrel);
       break;
 
-    /* Handle all the basic type 4 relocations.  */  
-    case R_HPPA_PCREL_CALL_11:
-    case R_HPPA_PCREL_CALL_14:
-    case R_HPPA_PCREL_CALL_17:
-      r_field = e_fsel;
-      goto do_basic_type_4;
-    case R_HPPA_PCREL_CALL_L21:
-      r_field = e_lsel;
-      goto do_basic_type_4;
-    case R_HPPA_PCREL_CALL_R11:
-    case R_HPPA_PCREL_CALL_R14:
-    case R_HPPA_PCREL_CALL_R17:
-      r_field = e_rsel;
-      goto do_basic_type_4;
-    case R_HPPA_PCREL_CALL_LS21:
-      r_field = e_lssel;
-      goto do_basic_type_4;
-    case R_HPPA_PCREL_CALL_RS11:
-    case R_HPPA_PCREL_CALL_RS14:
-    case R_HPPA_PCREL_CALL_RS17:
-      r_field = e_rssel;
-      goto do_basic_type_4;
-    case R_HPPA_PCREL_CALL_LD21:
-      r_field = e_ldsel;
-      goto do_basic_type_4;
-    case R_HPPA_PCREL_CALL_RD11:
-    case R_HPPA_PCREL_CALL_RD14:
-    case R_HPPA_PCREL_CALL_RD17:
-      r_field = e_rdsel;
-      goto do_basic_type_4;
-    case R_HPPA_PCREL_CALL_LR21:
+    /* For all the DP relative relocations, we need to examine the symbol's
+       section.  If it's a code section, then "data pointer relative" makes
+       no sense.  In that case we don't adjust the "value", and for 21 bit
+       addil instructions, we change the source addend register from %dp to
+       %r0.  */
+    case R_PARISC_DPREL21L:
       r_field = e_lrsel;
-      goto do_basic_type_4;
-    case R_HPPA_PCREL_CALL_RR14:
-    case R_HPPA_PCREL_CALL_RR17:
-      r_field = e_rrsel;
-
-    do_basic_type_4:
-      insn = hppa_elf_relocate_insn (abfd, input_section, insn, addr,
-                                    sym_value, r_addend, r_format,
-                                    r_field, r_pcrel);
-      break;
-
-    /* Handle all the basic type 5 relocations.  */  
-    case R_HPPA_PLABEL_32:
-    case R_HPPA_PLABEL_11:
-    case R_HPPA_PLABEL_14:
-      r_field = e_fsel;
-      goto do_basic_type_5;
-    case R_HPPA_PLABEL_L21:
-      r_field = e_lsel;
-      goto do_basic_type_5;
-    case R_HPPA_PLABEL_R11:
-    case R_HPPA_PLABEL_R14:
-      r_field = e_rsel;
-    do_basic_type_5:
-      insn = hppa_elf_relocate_insn (abfd, input_section, insn, addr,
-                                    sym_value, r_addend, r_format,
-                                    r_field, r_pcrel);
-      break;
-
-    /* Handle all basic type 6 relocations.  */
-    case R_HPPA_UNWIND_ENTRY:
-    case R_HPPA_UNWIND_ENTRIES:
-      hppa_elf_relocate_unwind_table (abfd, data, addr,
-                                     sym_value, r_addend,
-                                     r_type, r_field);
-      return bfd_reloc_ok;
-
-    /* This is a linker internal relocation.  */
-    case R_HPPA_STUB_CALL_17:
-      /* This relocation is for a branch to a long branch stub.
-        Change instruction to a BLE,N.  It may also be necessary
-        to interchange the branch and its delay slot.
-        The original instruction stream is
-
-           bl <foo>,r          ; call foo using register r as
-                               ; the return pointer
-           XXX                 ; delay slot instruction
-
-        The new instruction stream will be:
-
-           XXX                 ; delay slot instruction
-           ble <foo_stub>      ; call the long call stub for foo
-                               ; using r31 as the return pointer
-
-        This braindamage is necessary because the compiler may put
-        an instruction which uses %r31 in the delay slot of the original
-        call.  By changing the call instruction from a "bl" to a "ble"
-        %r31 gets clobbered before the delay slot executes.  This
-        also means the stub has to play funny games to make sure
-        we return to the instruction just after the BLE rather than
-        two instructions after the BLE.
-
-        We do not interchange the branch and delay slot if the delay
-        slot was already nullified, or if the instruction in the delay
-        slot modifies the return pointer to avoid an unconditional
-        jump after the call returns (GCC optimization).
-
-        None of this horseshit would be necessary if we put the
-        stubs between functions and just redirected the "bl" to
-        the stub.  Live and learn.  */
-        
-      /* Is this instruction nullified?  (does this ever happen?)  */
-      if (insn & 2)
-        {
-         insn = BLE_N_XXX_0_0;
-         bfd_put_32 (abfd, insn, hit_data);
-         r_type = R_HPPA_ABS_CALL_17;
-         r_pcrel = 0;
-         insn = hppa_elf_relocate_insn (abfd, input_section, insn,
-                                        addr, sym_value, r_addend,
-                                        r_format, r_field, r_pcrel);
-        }
-      else
+      if (sym_sec != NULL)
        {
-         /* So much for the trivial case...  */
-         unsigned long old_delay_slot_insn = bfd_get_32 (abfd, hit_data + 4);
-         unsigned rtn_reg = (insn & 0x03e00000) >> 21;
-
-         if (get_opcode (old_delay_slot_insn) == LDO)
+         if ((sym_sec->flags & SEC_CODE) != 0)
            {
-             unsigned ldo_src_reg = (old_delay_slot_insn & 0x03e00000) >> 21;
-             unsigned ldo_target_reg = (old_delay_slot_insn & 0x001f0000) >> 16;
-
-             /* If the target of the LDO is the same as the return
-                register then there is no reordering.  We can leave the
-                instuction as a non-nullified BLE in this case.
-
-                FIXME:  This test looks wrong.  If we had a ble using
-                ldo_target_reg as the *source* we'd fuck this up.  */
-             if (ldo_target_reg == rtn_reg)
-               {
-                 unsigned long new_delay_slot_insn = old_delay_slot_insn;
-
-                 BFD_ASSERT (ldo_src_reg == ldo_target_reg);
-                 new_delay_slot_insn &= 0xfc00ffff;
-                 new_delay_slot_insn |= ((31 << 21) | (31 << 16));
-                 bfd_put_32 (abfd, new_delay_slot_insn, hit_data + 4);
-                 insn = BLE_XXX_0_0;
-                 r_type = R_HPPA_ABS_CALL_17;
-                 r_pcrel = 0;
-                 insn = hppa_elf_relocate_insn (abfd, input_section, insn,
-                                                addr, sym_value, r_addend,
-                                                r_format, r_field, r_pcrel);
-                 bfd_put_32 (abfd, insn, hit_data);
-                 return bfd_reloc_ok;
-               }
-              else if (rtn_reg == 31)
-                {
-                  /* The return register is r31, so this is a millicode
-                    call.  Do not perform any instruction reordering.  */
-                 insn = BLE_XXX_0_0;
-                 r_type = R_HPPA_ABS_CALL_17;
-                 r_pcrel = 0;
-                 insn = hppa_elf_relocate_insn (abfd, input_section, insn,
-                                                addr, sym_value,
-                                                r_addend, r_format,
-                                                r_field, r_pcrel);
-                 bfd_put_32 (abfd, insn, hit_data);
-                 return bfd_reloc_ok;
-                }
-             else
+             if ((insn & ((0x3f << 26) | (0x1f << 21)))
+                 == (((int) OP_ADDIL << 26) | (27 << 21)))
                {
-                 /* Check to see if the delay slot instruction has a
-                    relocation.  If so, we need to change the address
-                    field of it because the instruction it relocates
-                    is going to be moved.  Oh what a mess.  */
-                 arelent * next_reloc_entry = reloc_entry+1;
-
-                 if (next_reloc_entry->address == reloc_entry->address + 4)
-                   next_reloc_entry->address -= 4;
-
-                 insn = old_delay_slot_insn;
-                 bfd_put_32 (abfd, insn, hit_data);
-                 insn = BLE_N_XXX_0_0;
-                 bfd_put_32 (abfd, insn, hit_data + 4);
-                 r_type = R_HPPA_ABS_CALL_17;
-                 r_pcrel = 0;
-                 insn = hppa_elf_relocate_insn (abfd, input_section, insn,
-                                                addr + 4,
-                                                sym_value, r_addend,
-                                                r_format, r_field, r_pcrel);
-                 bfd_put_32 (abfd, insn, hit_data + 4);
-                 return bfd_reloc_ok;
+                 insn &= ~ (0x1f << 21);
                }
            }
-         /* Same comments as above regarding incorrect test.  */
-          else if (rtn_reg == 31)
-            {
-              /* The return register is r31, so this is a millicode call.
-                Perform no instruction reordering in this case.  */
-             insn = BLE_XXX_0_0;
-             r_type = R_HPPA_ABS_CALL_17;
-             r_pcrel = 0;
-             insn = hppa_elf_relocate_insn (abfd, input_section, insn,
-                                            addr, sym_value,
-                                            r_addend, r_format,
-                                            r_field, r_pcrel);
-             bfd_put_32 (abfd, insn, hit_data);
-             return bfd_reloc_ok;
-            }
          else
-           {
-             /* Check to see if the delay slot instruction has a
-                relocation.  If so, we need to change its address
-                field  because the instruction it relocates is going
-                to be moved.  */
-             arelent * next_reloc_entry = reloc_entry+1;
-
-             if (next_reloc_entry->address == reloc_entry->address + 4)
-               next_reloc_entry->address -= 4;
-
-             insn = old_delay_slot_insn;
-             bfd_put_32 (abfd, insn, hit_data);
-             insn = BLE_N_XXX_0_0;
-             bfd_put_32 (abfd, insn, hit_data + 4);
-             r_type = R_HPPA_ABS_CALL_17;
-             r_pcrel = 0;
-             insn = hppa_elf_relocate_insn (abfd, input_section, insn,
-                                            addr + 4, sym_value,
-                                            r_addend, r_format,
-                                            r_field, r_pcrel);
-             bfd_put_32 (abfd, insn, hit_data + 4);
-             return bfd_reloc_ok;
-           }
+           value -= elf32_hppa_hash_table (info)->global_value;
        }
       break;
-      
-    /* Something we don't know how to handle.  */
-    default:
-      *error_message = (char *) "Unrecognized reloc";
-      return bfd_reloc_notsupported;
-    }
-
-  /* Update the instruction word.  */
-  bfd_put_32 (abfd, insn, hit_data);
-  return (bfd_reloc_ok);
-}
-
-/* Return the address of the howto table entry to perform the CODE
-   relocation for an ARCH machine.  */
-
-static CONST reloc_howto_type *
-elf_hppa_reloc_type_lookup (arch, code)
-     bfd_arch_info_type *arch;
-     bfd_reloc_code_real_type code;
-{
-  if ((int) code < (int) R_HPPA_UNIMPLEMENTED)
-    {
-      BFD_ASSERT ((int) elf_hppa_howto_table[(int) code].type == (int) code);
-      return &elf_hppa_howto_table[(int) code];
-    }
-  return NULL;
-}
-
-/* Return true if SYM represents a local label symbol.  */
-
-static boolean
-hppa_elf_is_local_label (abfd, sym)
-     bfd *abfd;
-     asymbol *sym;
-{
-  return (sym->name[0] == 'L' && sym->name[1] == '$');
-}
-
-/* Update the symbol extention chain to include the symbol pointed to
-   by SYMBOLP if SYMBOLP is a function symbol.  Used internally and by GAS.  */
-
-void
-elf_hppa_tc_symbol (abfd, symbolP, sym_idx, symext_root, symext_last)
-     bfd *abfd;
-     elf_symbol_type *symbolP;
-     int sym_idx;
-     symext_chainS **symext_root;
-     symext_chainS **symext_last;
-{
-  symext_chainS *symextP;
-  unsigned int arg_reloc;
-
-  /* Only functions can have argument relocations.  */
-  if (!(symbolP->symbol.flags & BSF_FUNCTION))
-    return;
-
-  arg_reloc = symbolP->tc_data.hppa_arg_reloc;
-
-  /* If there are no argument relocation bits, then no relocation is
-     necessary.  Do not add this to the symextn section.  */
-  if (arg_reloc == 0)
-    return;
-
-  /* Allocate memory and initialize this entry.  */
-  symextP = (symext_chainS *) bfd_alloc (abfd, sizeof (symext_chainS) * 2);
-  if (!symextP)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      abort();                 /* FIXME */
-    }
-
-  symextP[0].entry = ELF32_HPPA_SX_WORD (HPPA_SXT_SYMNDX, sym_idx);
-  symextP[0].next = &symextP[1];
-
-  symextP[1].entry = ELF32_HPPA_SX_WORD (HPPA_SXT_ARG_RELOC, arg_reloc);
-  symextP[1].next = NULL;
-
-  /* Now update the chain itself so it can be walked later to build
-     the symbol extension section.  */
-  if (*symext_root == NULL)
-    {
-      *symext_root = &symextP[0];
-      *symext_last = &symextP[1];
-    }
-  else
-    {
-      (*symext_last)->next = &symextP[0];
-      *symext_last = &symextP[1];
-    }
-}
-
-/* Build the symbol extension section.  Used internally and by GAS.  */ 
-
-void
-elf_hppa_tc_make_sections (abfd, symext_root)
-     bfd *abfd;
-     symext_chainS *symext_root;
-{
-  symext_chainS *symextP;
-  int size, n, i;
-  asection *symextn_sec;
-
-  /* FIXME: Huh?  I don't see what this is supposed to do for us.  */
-  hppa_elf_stub_finish (abfd);
-
-  /* If there are no entries in the symbol extension chain, then
-     there is no symbol extension section.  */
-  if (symext_root == NULL)
-    return;
-
-  /* Count the number of entries on the chain.  */
-  for (n = 0, symextP = symext_root; symextP; symextP = symextP->next, ++n)
-    ;
-
-  /* Create the symbol extension section and set some appropriate
-     attributes.  */
-  size = sizeof (symext_entryS) * n;
-  symextn_sec = bfd_get_section_by_name (abfd, SYMEXTN_SECTION_NAME);
-  if (symextn_sec == (asection *) 0)
-    {
-      symextn_sec = bfd_make_section (abfd, SYMEXTN_SECTION_NAME);
-      bfd_set_section_flags (abfd,
-                            symextn_sec,
-                            SEC_LOAD | SEC_HAS_CONTENTS | SEC_DATA);
-      symextn_sec->output_section = symextn_sec;
-      symextn_sec->output_offset = 0;
-      bfd_set_section_alignment (abfd, symextn_sec, 2);
-    }
-  bfd_set_section_size (abfd, symextn_sec, symextn_contents_real_size);
-  symextn_contents_real_size = size;
-
-  /* Grab some memory for the contents of the symbol extension section
-     itself.  */
-  symextn_contents = (symext_entryS *) bfd_alloc (abfd, size);
-  if (!symextn_contents)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      abort();                 /* FIXME */
-    }
-
-  /* Fill in the contents of the symbol extension section.  */
-  for (i = 0, symextP = symext_root; symextP; symextP = symextP->next, ++i)
-    symextn_contents[i] = symextP->entry;
-
-  return;
-}
-
-/* Return the symbol extension record of type TYPE for the symbol SYM.  */
-
-static symext_entryS
-elf32_hppa_get_sym_extn (abfd, sym, type)
-     bfd *abfd;
-     asymbol *sym;
-     int type;
-{
-  switch (type)
-    {
-    case HPPA_SXT_SYMNDX:
-    case HPPA_SXT_NULL:
-      return (symext_entryS) 0;
-    case HPPA_SXT_ARG_RELOC:
-      {
-       elf_symbol_type *esymP = (elf_symbol_type *) sym;
-
-       return (symext_entryS) esymP->tc_data.hppa_arg_reloc;
-      }
-    /* This should never happen.  */
-    default:
-      abort();
-    }
-}
 
-/* Search the chain of stub descriptions and locate the stub
-   description for this the given section within the given bfd.
-
-   FIXME:  I see yet another wonderful linear linked list search
-   here.  This is probably bad.  */
-
-static elf32_hppa_stub_description *
-find_stubs (abfd, stub_sec)
-     bfd *abfd;
-     asection *stub_sec;
-{
-  elf32_hppa_stub_description *stubP;
-
-  for (stubP = elf_hppa_stub_rootP; stubP; stubP = stubP->next)
-    {
-      /* Is this the right one?  */ 
-      if (stubP->this_bfd == abfd && stubP->stub_sec == stub_sec)
-       return stubP;
-    }
-  return NULL;
-}
-
-static elf32_hppa_stub_description *
-new_stub (abfd, stub_sec, link_info)
-     bfd *abfd;
-     asection *stub_sec;
-     struct bfd_link_info *link_info;
-{
-  elf32_hppa_stub_description *stub = find_stubs (abfd, stub_sec);
-
-  /* If we found a list for this bfd, then use it.  */
-  if (stub)
-    return stub;
-
-  /* Nope, allocate and initialize a new entry in the stub list chain.  */
-  stub = (elf32_hppa_stub_description *)
-    bfd_zalloc (abfd, sizeof (elf32_hppa_stub_description));
-  if (stub)
-    {
-      stub->this_bfd = abfd;
-      stub->stub_sec = stub_sec;
-      stub->real_size = 0;
-      stub->allocated_size = 0;
-      stub->stub_contents = NULL;
-      stub->stub_secp = NULL;
-      stub->link_info = link_info;
-
-      stub->next = elf_hppa_stub_rootP;
-      elf_hppa_stub_rootP = stub;
-    }
-  else
-    {
-      bfd_set_error (bfd_error_no_memory);
-      abort();                 /* FIXME */
-    }
-
-  return stub;
-}
-
-/* Try and locate a stub with the name NAME within the stubs
-   associated with ABFD.  More linked list searches.  */
-
-static elf32_hppa_stub_name_list *
-find_stub_by_name (abfd, stub_sec, name)
-     bfd *abfd;
-     asection *stub_sec;
-     char *name;
-{
-  /* Find the stubs associated with this bfd.  */
-  elf32_hppa_stub_description *stub = find_stubs (abfd, stub_sec);
+    case R_PARISC_DPREL14R:
+      r_field = e_rrsel;
+      if (sym_sec != NULL && (sym_sec->flags & SEC_CODE) == 0)
+       value -= elf32_hppa_hash_table (info)->global_value;
+      break;
 
-  /* If found, then we have to walk down them looking for a match.  */
-  if (stub)
-    {
-      elf32_hppa_stub_name_list *name_listP;
+    case R_PARISC_DPREL14F:
+      r_field = e_fsel;
+      if (sym_sec != NULL && (sym_sec->flags & SEC_CODE) == 0)
+       value -= elf32_hppa_hash_table (info)->global_value;
+      break;
 
-      for (name_listP = stub->stub_listP;
-          name_listP;
-          name_listP = name_listP->next)
-       {
-         if (!strcmp (name_listP->sym->name, name))
-           return name_listP;
-       }
-    }
+    case R_PARISC_PLABEL32:
+      r_field = e_fsel;
+      break;
 
-  /* Not found.  */
-  return 0;
-}
+    case R_PARISC_PLABEL21L:
+      r_field = e_lrsel;
+      break;
 
-/* Add a new stub (SYM) to the list of stubs associated with the given BFD.  */
-static elf32_hppa_stub_name_list *
-add_stub_by_name(abfd, stub_sec, sym, link_info)
-     bfd *abfd;
-     asection *stub_sec;
-     asymbol *sym;
-     struct bfd_link_info *link_info;
-{
-  elf32_hppa_stub_description *stub = find_stubs (abfd, stub_sec);
-  elf32_hppa_stub_name_list *stub_entry;
+    case R_PARISC_PLABEL14R:
+      r_field = e_rrsel;
+      break;
 
-  /* If no stubs are associated with this bfd, then we have to make
-     a chain-of-stubs associated with this bfd.  */
-  if (!stub)
-    stub = new_stub (abfd, stub_sec, link_info);
+    /* This case is separate as it may involve a lot more work
+       to deal with linker stubs.  */
+    case R_PARISC_PCREL17F:
+      r_field = e_fsel;
 
-  if (stub)
-    {
-      /* Allocate and initialize an entry in the stub chain.  */
-      stub_entry = (elf32_hppa_stub_name_list *)
-       bfd_zalloc (abfd, sizeof (elf32_hppa_stub_name_list));
+      /* bfd_link_hash_undefweak symbols have sym_sec == NULL.  */
+      if (sym_sec == NULL)
+       break;
 
-      if (stub_entry)
+      /* Any kind of linker stub needed?  */
+      /* bfd_vma value is unsigned, so this is testing for offsets
+        outside the range -0x40000 to +0x3ffff  */
+      if (value + addend - 8 + 0x40000 >= 0x80000)
        {
-         stub_entry->size = 0;
-         stub_entry->sym = sym;
-         stub_entry->stub_desc = stub;
-         /* First byte of this stub is the pointer to
-            the next available location in the stub buffer.  */
-         stub_entry->stub_secp = stub->stub_secp;
-         /* Add it to the chain.  */
-         if (stub->stub_listP)
-           stub_entry->next = stub->stub_listP;
-         else
-           stub_entry->next = NULL;
-         stub->stub_listP = stub_entry;
-         return stub_entry;
-       }
-      else
-       {
-         bfd_set_error (bfd_error_no_memory);
-         abort();              /* FIXME */
-       }
-    }
-  /* Death by mis-adventure.  */
-  abort ();
-  return (elf32_hppa_stub_name_list *)NULL;
-}
+         struct bfd_hash_table *stub_hash_table;
+         struct elf32_hppa_stub_hash_entry *stub_entry;
+         char *stub_name;
 
-/* For the given caller/callee argument location information and the
-   type of relocation (arguments or return value), return the type
-   of argument relocation needed to make caller and callee happy.  */
-
-static arg_reloc_type
-type_of_mismatch (caller_bits, callee_bits, type)
-     int caller_bits;
-     int callee_bits;
-     int type;
-{
-  switch (type)
-    {
-    case ARGUMENTS:
-      return mismatches[caller_bits][callee_bits];
-    case RETURN_VALUE:
-      return retval_mismatches[caller_bits][callee_bits];
-    }
-  return ARG_RELOC_ERR;
-}
-
-/* Extract specific argument location bits for WHICH from the
-   the full argument location information in AR.  */
-#define EXTRACT_ARBITS(ar, which)      ((ar) >> (8 - ((which) * 2))) & 3
-
-/* Add the new instruction INSN into the stub area denoted by ENTRY.
-   FIXME:  Looks like more cases where we assume sizeof (int) ==
-   sizeof (insn) which may not be true if building cross tools.  */
-#define NEW_INSTRUCTION(entry, insn)   \
-{ \
-  *((entry)->stub_desc->stub_secp)++ = (insn); \
-  (entry)->stub_desc->real_size += sizeof (int);       \
-  (entry)->size += sizeof(int);        \
-  bfd_set_section_size((entry)->stub_desc->this_bfd,   \
-                      (entry)->stub_desc->stub_sec,    \
-                      (entry)->stub_desc->real_size);  \
-}
-
-/* Find the offset of the current stub?  Looks more like it
-   finds the offset of the last instruction to me.  */
-#define CURRENT_STUB_OFFSET(entry)     \
-  ((char *)(entry)->stub_desc->stub_secp \
-   - (char *)(entry)->stub_desc->stub_contents - 4)
-
-/* All the stubs have already been built, finish up stub stuff
-   by applying relocations to the stubs.  */
-
-static void
-hppa_elf_stub_finish (output_bfd)
-     bfd *output_bfd;
-{
-  elf32_hppa_stub_description *stub_list = elf_hppa_stub_rootP;
-
-  /* If the stubs have been finished, then we're already done.  */
-  if (stubs_finished)
-    return;
-
-  /* Walk down the list of stub lists. */
-  for (; stub_list; stub_list = stub_list->next)
-    {
-      /* If this list has stubs, then do something.  */
-      if (stub_list->real_size)
-       {
-         bfd *stub_bfd = stub_list->this_bfd;
-         asection *stub_sec = bfd_get_section_by_name (stub_bfd,
-                                                       ".hppa_linker_stubs");
-         long reloc_size;
-         arelent **reloc_vector;
-         long reloc_count;
-
-         /* Some sanity checking.  */
-         BFD_ASSERT (stub_sec == stub_list->stub_sec);
-         BFD_ASSERT (stub_sec);
-
-         /* For stub sections raw_size == cooked_size.  Also update
-            reloc_done as we're handling the relocs now.  */
-         stub_sec->_cooked_size = stub_sec->_raw_size;
-         stub_sec->reloc_done = true;
-
-         /* Make space to hold the relocations for the stub section.  */
-         reloc_size = bfd_get_reloc_upper_bound (stub_bfd, stub_sec);
-         if (reloc_size < 0)
+         stub_name = elf32_hppa_stub_name (sym_name, sym_sec,
+                                           input_section, addend, h);
+         if (!stub_name)
            {
-             /* FIXME: Should return an error.  */
-             abort ();
-           }
-         reloc_vector = (arelent **) malloc (reloc_size);
-         if (reloc_vector == NULL && reloc_size != 0)
-           {
-             /* FIXME: should be returning an error so the caller can
-                clean up */
-             abort ();
+             (*_bfd_error_handler) ("%s: %s",
+                                    bfd_get_filename (input_bfd),
+                                    bfd_errmsg (bfd_get_error ()));
+             return bfd_reloc_notsupported;
            }
 
-         /* If we have relocations, do them.  */
-         reloc_count = bfd_canonicalize_reloc (stub_bfd, stub_sec,
-                                               reloc_vector,
-                                               output_bfd->outsymbols);
-         if (reloc_count < 0)
-           {
-             /* FIXME: Should return an error.  */
-             abort ();
-           }
-         if (reloc_count > 0)
-           {
-             arelent **parent;
-             for (parent = reloc_vector; *parent != NULL; parent++)
-               {
-                 char *err = NULL;
-                 bfd_reloc_status_type r =
-                   bfd_perform_relocation (stub_bfd, *parent,
-                                           stub_list->stub_contents,
-                                           stub_sec, (bfd *) NULL, &err);
-
-                 /* If there was an error, tell someone about it.  */
-                 if (r != bfd_reloc_ok)
-                   {
-                     struct bfd_link_info *link_info = stub_list->link_info;
+         stub_hash_table = &elf32_hppa_hash_table (info)->stub_hash_table;
 
-                     switch (r)
-                       {
-                       case bfd_reloc_undefined:
-                         if (! ((*link_info->callbacks->undefined_symbol)
-                                (link_info,
-                                 bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
-                                 stub_bfd, stub_sec, (*parent)->address)))
-                           abort ();
-                         break;
-                       case bfd_reloc_dangerous:
-                         if (! ((*link_info->callbacks->reloc_dangerous)
-                                (link_info, err, stub_bfd, stub_sec,
-                                 (*parent)->address)))
-                           abort ();
-                         break;
-                       case bfd_reloc_overflow:
-                         {
-                           if (! ((*link_info->callbacks->reloc_overflow)
-                                  (link_info,
-                                   bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
-                                   (*parent)->howto->name,
-                                   (*parent)->addend,
-                                   stub_bfd, stub_sec,
-                                   (*parent)->address)))
-                             abort ();
-                         }
-                         break;
-                       case bfd_reloc_outofrange:
-                       default:
-                         abort ();
-                         break;
-                       }
-                   }
-               }
+         stub_entry = elf32_hppa_stub_hash_lookup (stub_hash_table,
+                                                   stub_name,
+                                                   false,
+                                                   false);
+         if (stub_entry == NULL)
+           {
+             (*_bfd_error_handler)
+               (_("%s: cannot find stub entry %s"),
+                bfd_get_filename (input_bfd),
+                stub_name);
+             free (stub_name);
+             return bfd_reloc_notsupported;
            }
-         free (reloc_vector);
-
-         /* All done with the relocations.  Set the final contents
-            of the stub section.  FIXME: no check of return value!  */
-         bfd_set_section_contents (output_bfd, stub_sec,
-                                   stub_list->stub_contents,
-                                   0, stub_list->real_size);
-       }
-    }
-  /* All done.  */
-  stubs_finished = true;
-}
-
-/* Allocate a new relocation entry to be used in a linker stub.  */
-
-static void
-hppa_elf_stub_reloc (stub_desc, output_bfd, target_sym, offset, type)
-     elf32_hppa_stub_description *stub_desc;
-     bfd *output_bfd;
-     asymbol **target_sym;
-     int offset;
-     elf32_hppa_reloc_type type;
-{
-  arelent relent;
-  int size;
-  Elf_Internal_Shdr *rela_hdr;
-
-  /* I really don't like the realloc nonsense in here.  FIXME.  */
-  if (stub_desc->relocs_allocated_cnt == stub_desc->stub_sec->reloc_count)
-    {
-      /* Allocate the first few relocation entries.  */
-      if (stub_desc->stub_sec->relocation == NULL)
-       {
-         stub_desc->relocs_allocated_cnt = STUB_RELOC_INCR;
-         size = sizeof (arelent) * stub_desc->relocs_allocated_cnt;
-         stub_desc->stub_sec->relocation = (arelent *) bfd_zmalloc (size);
-       }
-      else
-       {
-         /* We've used all the entries we've already allocated.  So get
-            some more.  */
-         stub_desc->relocs_allocated_cnt += STUB_RELOC_INCR;
-         size = sizeof (arelent) * stub_desc->relocs_allocated_cnt;
-         stub_desc->stub_sec->relocation = (arelent *)
-           realloc (stub_desc->stub_sec->relocation, size);
-       }
-      if (!stub_desc->stub_sec->relocation)
-       {
-         bfd_set_error (bfd_error_no_memory);
-         abort ();             /* FIXME */
-       }
-    }
-
-  rela_hdr = &elf_section_data(stub_desc->stub_sec)->rel_hdr;
-  rela_hdr->sh_size += sizeof(Elf32_External_Rela);
-
-  /* Fill in the details. */
-  relent.address = offset;
-  relent.addend = 0;
-  relent.sym_ptr_ptr = target_sym;
-  relent.howto = bfd_reloc_type_lookup (stub_desc->this_bfd, type);
 
-  /* Save it in the array of relocations for the stub section.  */
-  memcpy (&stub_desc->stub_sec->relocation[stub_desc->stub_sec->reloc_count++],
-         &relent, sizeof (arelent));
-}
-
-/* Build an argument relocation stub.  RTN_ADJUST is a hint that an
-   adjust to the return pointer from within the stub itself may be
-   needed.  */
-
-static asymbol *
-hppa_elf_build_linker_stub (abfd, output_bfd, link_info, reloc_entry,
-                           stub_types, rtn_adjust, data, linker_stub_type)
-     bfd *abfd;
-     bfd *output_bfd;
-     struct bfd_link_info *link_info;
-     arelent *reloc_entry;
-     arg_reloc_type stub_types[5];
-     int rtn_adjust;
-     unsigned *data;
-     hppa_stub_type linker_stub_type;
-{
-  int i;
-  boolean milli, dyncall;
-  char stub_sym_name[128];
-  elf32_hppa_stub_name_list *stub_entry;
-  /* Some initialization.  */
-  unsigned insn = data[0];
-  asymbol *stub_sym = NULL;
-  asymbol **orig_sym = reloc_entry->sym_ptr_ptr;
-  asection *stub_sec = bfd_get_section_by_name (abfd, ".hppa_linker_stubs");
-  elf32_hppa_stub_description *stub_desc = find_stubs (abfd, stub_sec);
-
-  /* Perform some additional checks on whether we should really do the
-     return adjustment.  For example, if the instruction is nullified
-     or if the delay slot contains an instruction that modifies the return
-     pointer, then the branch instructions should not be rearranged
-     (rtn_adjust is false).  */
-  if (insn & 2 || insn == 0)
-    rtn_adjust = false;
-  else
-    {
-      unsigned delay_insn = data[1];
+         /* Munge up the value and addend for elf32_hppa_relocate_insn.  */
+         value = (stub_entry->offset
+                  + stub_entry->stub_sec->output_offset
+                  + stub_entry->stub_sec->output_section->vma
+                  - location);
+         addend = 0;
 
-      if (get_opcode (delay_insn) == LDO
-         && (((insn & 0x03e00000) >> 21) == ((delay_insn & 0x001f0000) >> 16)))
-       rtn_adjust = false;
-    }
+         if (value + addend - 8 + 0x40000 >= 0x80000)
+           {
+             (*_bfd_error_handler)
+               (_("%s: cannot reach stub %s, recompile with -ffunction-sections"),
+                bfd_get_filename (input_bfd),
+                stub_name);
+             free (stub_name);
+             return bfd_reloc_notsupported;
+           }
 
-  /* Some special code for long-call stubs.  */
-  if (linker_stub_type == HPPA_STUB_LONG_CALL)
-    {
-      
-      /* Is this a millicode call?  If so, the return address
-        comes in on r31 rather than r2 (rp) so a slightly
-        different code sequence is needed.  */
-      unsigned rtn_reg = (insn & 0x03e00000) >> 21;
-      if (rtn_reg == 31)
-       milli = true;
-      
-      /* Dyncall is special because the user code has already
-        put the return pointer in %r2 (aka RP).  Other millicode
-        calls have the return pointer in %r31.  */
-      if (strcmp ((*orig_sym)->name, "$$dyncall") == 0)
-       dyncall = true;
-      
-      /* If we are creating a call from a stub to another stub, then
-        never do the instruction reordering.  We can tell if we are
-        going to be calling one stub from another by the fact that
-        the symbol name has '_stub_' (arg. reloc. stub) or '_lb_stub_'
-        prepended to the name.  Alternatively, the section of the
-        symbol will be '.hppa_linker_stubs'.  This is only an issue
-        for long-calls; they are the only stubs allowed to call another
-        stub.  */
-      if ((strncmp ((*orig_sym)->name, "_stub_", 6) == 0)
-         || (strncmp ((*orig_sym)->name, "_lb_stub_", 9) == 0))
-       {
-         BFD_ASSERT (strcmp ((*orig_sym)->section->name, ".hppa_linker_stubs")
-                     == 0);
-         rtn_adjust = false;
+         free (stub_name);
        }
-    }
-
-  /* Create the stub section if necessary.  */
-  if (!stub_sec)
-    {
-      BFD_ASSERT (stub_desc == NULL);
-      hppa_elf_create_stub_sec (abfd, output_bfd, &stub_sec, link_info);
-      stub_desc = new_stub (abfd, stub_sec, link_info);
-    }
-
-  /* Make the stub if we did not find one already.  */
-  if (!stub_desc)
-    stub_desc = new_stub (abfd, stub_sec, link_info);
-
-  /* Allocate space to write the stub.
-     FIXME:  Why using realloc?!?  */
-  if (!stub_desc->stub_contents)
-    {
-      stub_desc->allocated_size = STUB_BUFFER_INCR;
-      stub_desc->stub_contents = (char *) malloc (STUB_BUFFER_INCR);
-    }
-  else if ((stub_desc->allocated_size - stub_desc->real_size) < STUB_MAX_SIZE)
-    {
-      stub_desc->allocated_size = stub_desc->allocated_size + STUB_BUFFER_INCR;
-      stub_desc->stub_contents = (char *) realloc (stub_desc->stub_contents,
-                                                  stub_desc->allocated_size);
-    }
+      break;
 
-  /* If no memory die.  (I seriously doubt the other routines
-     are prepared to get a NULL return value).  */
-  if (!stub_desc->stub_contents)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      abort ();
+    /* Something we don't know how to handle.  */
+    default:
+      return bfd_reloc_notsupported;
     }
 
-  /* Generate an appropriate name for this stub.  */
-  if (linker_stub_type == HPPA_STUB_ARG_RELOC)
-    sprintf (stub_sym_name,
-            "_stub_%s_%02d_%02d_%02d_%02d_%02d_%s",
-            reloc_entry->sym_ptr_ptr[0]->name,
-            stub_types[0], stub_types[1], stub_types[2],
-            stub_types[3], stub_types[4],
-            rtn_adjust ? "RA" : "");
-  else
-    sprintf (stub_sym_name,
-            "_lb_stub_%s_%s", reloc_entry->sym_ptr_ptr[0]->name,
-            rtn_adjust ? "RA" : "");
-
-
-  stub_desc->stub_secp
-    = (int *) (stub_desc->stub_contents + stub_desc->real_size);
-  stub_entry = find_stub_by_name (abfd, stub_sec, stub_sym_name);
-
-  /* See if we already have one by this name.  */
-  if (stub_entry)
+  /* bfd_link_hash_undefweak symbols have sym_sec == NULL.  */
+  if (sym_sec == NULL)
     {
-      /* Yes, re-use it.  Redirect the original relocation from the
-        old symbol (a function symbol) to the stub (the stub will call
-        the original function).  */
-      stub_sym = stub_entry->sym;
-      reloc_entry->sym_ptr_ptr = (asymbol **) bfd_zalloc (abfd,
-                                                         sizeof (asymbol **));
-      if (reloc_entry->sym_ptr_ptr == NULL)
-       {
-         bfd_set_error (bfd_error_no_memory);
-         abort ();
-       }
-      reloc_entry->sym_ptr_ptr[0] = stub_sym;
-      if (linker_stub_type == HPPA_STUB_LONG_CALL
-         || (reloc_entry->howto->type != R_HPPA_PLABEL_32
-             && (get_opcode(insn) == BLE
-                 || get_opcode (insn) == BE
-                 || get_opcode (insn) == BL)))
-       reloc_entry->howto = bfd_reloc_type_lookup (abfd, R_HPPA_STUB_CALL_17);
+      BFD_ASSERT (h != NULL && h->root.type == bfd_link_hash_undefweak);
+      value = 0;
     }
-  else
-    {
-      /* Create a new symbol to point to this stub.  */
-      stub_sym = bfd_make_empty_symbol (abfd);
-      if (!stub_sym)
-       {
-         bfd_set_error (bfd_error_no_memory);
-         abort ();
-       }
-      stub_sym->name = bfd_zalloc (abfd, strlen (stub_sym_name) + 1);
-      if (!stub_sym->name)
-       {
-         bfd_set_error (bfd_error_no_memory);
-         abort ();
-       }
-      strcpy ((char *) stub_sym->name, stub_sym_name);
-      stub_sym->value
-       = (char *) stub_desc->stub_secp - (char *) stub_desc->stub_contents;
-      stub_sym->section = stub_sec;
-      stub_sym->flags = BSF_LOCAL | BSF_FUNCTION;
-      stub_entry = add_stub_by_name (abfd, stub_sec, stub_sym, link_info);
-
-      /* Redirect the original relocation from the old symbol (a function)
-        to the stub (the stub calls the function).  */
-      reloc_entry->sym_ptr_ptr = (asymbol **) bfd_zalloc (abfd,
-                                                         sizeof (asymbol **));
-      if (reloc_entry->sym_ptr_ptr == NULL)
-       {
-         bfd_set_error (bfd_error_no_memory);
-         abort ();
-       }
-      reloc_entry->sym_ptr_ptr[0] = stub_sym;
-      if (linker_stub_type == HPPA_STUB_LONG_CALL
-         || (reloc_entry->howto->type != R_HPPA_PLABEL_32
-             && (get_opcode (insn) == BLE
-                 || get_opcode (insn) == BE
-                 || get_opcode (insn) == BL)))
-       reloc_entry->howto = bfd_reloc_type_lookup (abfd, R_HPPA_STUB_CALL_17);
-
-      /* Now generate the code for the stub.  Starting with two
-        common instructions.
-
-        FIXME:  Do we still need the SP adjustment?
-                Do we still need to muck with space registers?  */
-      NEW_INSTRUCTION (stub_entry, LDSID_31_1)
-      NEW_INSTRUCTION (stub_entry, MTSP_1_SR0)
-
-      if (linker_stub_type == HPPA_STUB_ARG_RELOC)
-       {
-         NEW_INSTRUCTION (stub_entry, ADDI_8_SP)
 
-         /* Examine each argument, generating code to relocate it
-            into a different register if necessary.  */
-           for (i = ARG0; i < ARG3; i++)
-             {
-               switch (stub_types[i])
-                 {
-
-                 case NO_ARG_RELOC:
-                   continue;
+  insn = elf32_hppa_relocate_insn (insn, value, addend,
+                                  r_type, r_format, r_field);
 
-                 case R_TO_FR:
-                   switch (i)
-                     {
-                     case ARG0:
-                       NEW_INSTRUCTION (stub_entry, STWS_ARG0_M8SP)
-                       NEW_INSTRUCTION (stub_entry, FLDWS_M8SP_FARG0)
-                         break;
-                     case ARG1:
-                       NEW_INSTRUCTION (stub_entry, STWS_ARG1_M8SP)
-                       NEW_INSTRUCTION (stub_entry, FLDWS_M8SP_FARG1)
-                         break;
-                     case ARG2:
-                       NEW_INSTRUCTION (stub_entry, STWS_ARG2_M8SP)
-                       NEW_INSTRUCTION (stub_entry, FLDWS_M8SP_FARG2)
-                         break;
-                     case ARG3:
-                       NEW_INSTRUCTION (stub_entry, STWS_ARG3_M8SP)
-                       NEW_INSTRUCTION (stub_entry, FLDWS_M8SP_FARG3)
-                         break;
-                     }
-                   continue;
-             
-                 case R01_TO_FR:
-                   switch (i)
-                     {
-                     case ARG0:
-                       NEW_INSTRUCTION (stub_entry, STWS_ARG0_M4SP)
-                       NEW_INSTRUCTION (stub_entry, STWS_ARG1_M8SP)
-                       NEW_INSTRUCTION (stub_entry, FLDDS_M8SP_FARG1)
-                         break;
-                     default:
-                       abort ();
-                       break;
-                     }
-                   continue;
+  /* Update the instruction word.  */
+  bfd_put_32 (input_bfd, insn, hit_data);
+  return bfd_reloc_ok;
+}
 
-                 case R23_TO_FR:
-                   switch (i)
-                     {
-                     case ARG2:
-                       NEW_INSTRUCTION (stub_entry, STWS_ARG2_M4SP)
-                       NEW_INSTRUCTION (stub_entry, STWS_ARG3_M8SP)
-                       NEW_INSTRUCTION (stub_entry, FLDDS_M8SP_FARG3)
-                         break;
-                     default:
-                       abort ();
-                       break;
-                     }
-                   continue;
+/* Relocate an HPPA ELF section.  */
 
-                 case FR_TO_R:
-                   switch (i)
-                     {
-                     case ARG0:
-                       NEW_INSTRUCTION (stub_entry, FSTWS_FARG0_M8SP)
-                       NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG0)
-                         break;
-                     case ARG1:
-                       NEW_INSTRUCTION (stub_entry, FSTWS_FARG1_M8SP)
-                       NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG1)
-                         break;
-                     case ARG2:
-                       NEW_INSTRUCTION (stub_entry, FSTWS_FARG2_M8SP)
-                       NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG2)
-                         break;
-                     case ARG3:
-                       NEW_INSTRUCTION (stub_entry, FSTWS_FARG3_M8SP)
-                       NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG3)
-                         break;
-                     }
-                   continue;
-             
-                 case FR_TO_R01:
-                   switch (i)
-                     {
-                     case ARG0:
-                       NEW_INSTRUCTION (stub_entry, FSTDS_FARG1_M8SP)
-                       NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG0)
-                       NEW_INSTRUCTION (stub_entry, LDWS_M8SP_ARG1)
-                         break;
-                     default:
-                       abort ();
-                       break;
-                     }
-                   continue;
-             
-                 case FR_TO_R23:
-                   switch (i)
-                     {
-                     case ARG2:
-                       NEW_INSTRUCTION (stub_entry, FSTDS_FARG3_M8SP)
-                       NEW_INSTRUCTION (stub_entry, LDWS_M4SP_ARG2)
-                       NEW_INSTRUCTION (stub_entry, LDWS_M8SP_ARG3)
-                         break;
-                     default:
-                       abort ();
-                       break;
-                     }
-                   continue;
+static boolean
+elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
+                            contents, relocs, local_syms, local_sections)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
 
-                 default:
-                   abort ();
-                   break;
-                 }
-             }
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
 
-         /* Put the stack pointer back.  FIXME:  Is this still necessary?  */
-         NEW_INSTRUCTION (stub_entry, ADDI_M8_SP_SP)
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      unsigned int r_type;
+      reloc_howto_type *howto;
+      unsigned int r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      asection *sym_sec;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *sym_name;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
+       {
+         bfd_set_error (bfd_error_bad_value);
+         return false;
        }
+      howto = elf_hppa_howto_table + r_type;
 
-      /* Common code again.  Return pointer adjustment and the like.  */
-      if (!dyncall)
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      if (info->relocateable)
        {
-         /* This isn't dyncall.  */ 
-         if (!milli)
-           {
-             /* It's not a millicode call, so get the correct return
-                value into %r2 (aka RP).  */
-             if (rtn_adjust)
-               NEW_INSTRUCTION (stub_entry, ADDI_M4_31_RP)
-             else
-               NEW_INSTRUCTION (stub_entry, COPY_31_2)
-           }
-         else
+         /* This is a relocateable link.  We don't have to change
+            anything, unless the reloc is against a section symbol,
+            in which case we have to adjust according to where the
+            section symbol winds up in the output section.  */
+         if (r_symndx < symtab_hdr->sh_info)
            {
-             /* It is a millicode call, so get the correct return
-                value into %r1?!?.  FIXME:  Shouldn't this be
-                %r31?  Yes, and a little re-arrangement of the
-                code below would make that possible.  */
-             if (rtn_adjust)
-               NEW_INSTRUCTION (stub_entry, ADDI_M4_31_1)
-             else
-               NEW_INSTRUCTION (stub_entry, COPY_31_1)
+             sym = local_syms + r_symndx;
+             if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+               {
+                 sym_sec = local_sections[r_symndx];
+                 rel->r_addend += sym_sec->output_offset;
+               }
            }
-       }
-      else
-       {
-         /* This is dyncall, so the code is a little different as the
-            return pointer is already in %r2 (aka RP).  */
-         if (rtn_adjust)
-           NEW_INSTRUCTION (stub_entry, ADDI_M4_31_RP)
+
+         continue;
        }
 
-      /* Save the return address.  */
-      if (linker_stub_type == HPPA_STUB_ARG_RELOC)
-       NEW_INSTRUCTION (stub_entry, STW_RP_M8SP)
-
-      /* Long branch to the target function.  */
-      NEW_INSTRUCTION (stub_entry, LDIL_XXX_31)
-      hppa_elf_stub_reloc (stub_entry->stub_desc,
-                          abfd, orig_sym,
-                          CURRENT_STUB_OFFSET (stub_entry),
-                          R_HPPA_L21);
-      NEW_INSTRUCTION (stub_entry, BLE_XXX_0_31)
-      hppa_elf_stub_reloc (stub_entry->stub_desc,
-                          abfd, orig_sym,
-                          CURRENT_STUB_OFFSET (stub_entry),
-                          R_HPPA_ABS_CALL_R17);
-
-      if (linker_stub_type == HPPA_STUB_ARG_RELOC)
+      /* This is a final link.  */
+      h = NULL;
+      sym = NULL;
+      sym_sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
        {
-         /* In delay slot of long-call, copy %r31 into %r2 so that
-            the callee can return in the normal fashion.  */
-         NEW_INSTRUCTION (stub_entry, COPY_31_2)
-
-         /* Restore the return address.  */
-         NEW_INSTRUCTION (stub_entry, LDW_M8SP_RP)
-      
-         /* Generate the code to move the return value around.  */
-           switch (stub_types[RETVAL])
-             {
-             case NO_ARG_RELOC:
-               break;
-         
-             case R_TO_FR:
-               NEW_INSTRUCTION (stub_entry, STWS_RET0_M8SP)
-               NEW_INSTRUCTION (stub_entry, FLDWS_M8SP_FRET0)
-                 break;
-         
-             case FR_TO_R:
-               NEW_INSTRUCTION (stub_entry, FSTWS_FRET0_M8SP)
-               NEW_INSTRUCTION (stub_entry, LDWS_M4SP_RET0)
-                 break;
-
-             default:
-               abort ();
-               break;
-             }
-
-         /* Return back to the main code stream.  */
-         NEW_INSTRUCTION (stub_entry, BV_N_0_RP)
+         sym = local_syms + r_symndx;
+         sym_sec = local_sections[r_symndx];
+         relocation = ((ELF_ST_TYPE (sym->st_info) == STT_SECTION
+                          ? 0 : sym->st_value)
+                        + sym_sec->output_offset
+                        + sym_sec->output_section->vma);
        }
       else
        {
-         if (!dyncall)
+         int indx;
+
+         indx = r_symndx - symtab_hdr->sh_info;
+         h = elf_sym_hashes (input_bfd)[indx];
+         while (h->root.type == bfd_link_hash_indirect
+                || h->root.type == bfd_link_hash_warning)
+           h = (struct elf_link_hash_entry *) h->root.u.i.link;
+         if (h->root.type == bfd_link_hash_defined
+             || h->root.type == bfd_link_hash_defweak)
            {
-             /* Get return address into %r31.  Both variants may be necessary
-                (I think) as we could be cascading into another stub.  */
-             if (!milli)
-               NEW_INSTRUCTION (stub_entry, COPY_2_31)
-             else
-               NEW_INSTRUCTION (stub_entry, COPY_1_31)
+             sym_sec = h->root.u.def.section;
+             relocation = (h->root.u.def.value
+                           + sym_sec->output_offset
+                           + sym_sec->output_section->vma);
            }
+         else if (h->root.type == bfd_link_hash_undefweak)
+           relocation = 0;
          else
            {
-             /* Get the return address into %r31 too.  Might be necessary
-                (I think) as we could be cascading into another stub.  */
-             NEW_INSTRUCTION (stub_entry, COPY_2_31)
+             if (!((*info->callbacks->undefined_symbol)
+                   (info, h->root.root.string, input_bfd,
+                    input_section, rel->r_offset, true)))
+               return false;
+             break;
            }
+       }
+
+      if (h != NULL)
+       sym_name = h->root.root.string;
+      else
+       {
+         sym_name = bfd_elf_string_from_elf_section (input_bfd,
+                                                     symtab_hdr->sh_link,
+                                                     sym->st_name);
+         if (sym_name == NULL)
+           return false;
+         if (*sym_name == '\0')
+           sym_name = bfd_section_name (input_bfd, sym_sec);
+       }
+
+      r = elf32_hppa_bfd_final_link_relocate (howto, input_bfd,
+                                             input_section, contents,
+                                             rel->r_offset, relocation,
+                                             rel->r_addend, info, sym_sec,
+                                             sym_name, h);
+
+      switch (r)
+       {
+       case bfd_reloc_ok:
+         break;
 
-         /* No need for a return to the main stream.  */
+       case bfd_reloc_undefined:
+       case bfd_reloc_notsupported:
+         (*_bfd_error_handler)
+           (_("%s: cannot handle relocation %s for %s at 0x%x in %s"),
+            bfd_get_filename (input_bfd),
+            howto->name,
+            sym_name,
+            rel->r_offset,
+            input_section->name);
+         return false;
+
+       default:
+       case bfd_reloc_outofrange:
+       case bfd_reloc_overflow:
+         {
+           if (!((*info->callbacks->reloc_overflow)
+                 (info, sym_name, howto->name, (bfd_vma) 0,
+                  input_bfd, input_section, rel->r_offset)))
+             return false;
+         }
+         break;
        }
     }
-  return stub_sym;
+
+  return true;
 }
 
-/* Return nonzero if an argument relocation will be needed to call
-   the function (symbol in RELOC_ENTRY) assuming the caller has
-   argument relocation bugs CALLER_AR.  */
+/* Called after we have seen all the input files/sections, but before
+   final symbol resolution and section placement has been determined.
 
-static int
-hppa_elf_arg_reloc_needed_p (abfd, reloc_entry, stub_types, caller_ar)
+   We use this hook to (possibly) provide a value for __gp, then we
+   fall back to the generic ELF final link routine.  */
+
+boolean
+elf32_hppa_final_link (abfd, info)
      bfd *abfd;
-     arelent *reloc_entry;
-     arg_reloc_type stub_types[5];
-     symext_entryS caller_ar;
+     struct bfd_link_info *info;
 {
-  /* If the symbol is still undefined, then it's impossible to know
-     if an argument relocation is needed.  */
-  if (reloc_entry->sym_ptr_ptr[0] 
-      && reloc_entry->sym_ptr_ptr[0]->section != &bfd_und_section)
+  if (!info->relocateable)
     {
-      symext_entryS callee_ar = elf32_hppa_get_sym_extn (abfd,
-                                               reloc_entry->sym_ptr_ptr[0],
-                                                        HPPA_SXT_ARG_RELOC);
+      struct elf_link_hash_entry *h;
+      asection *sec;
+      bfd_vma gp_val;
 
-      /* Now examine all the argument and return value location
-        information to determine if a relocation stub will be needed.  */
-      if (caller_ar && callee_ar)
-       {
-         arg_location caller_loc[5];
-         arg_location callee_loc[5];
-
-         /* Extract the location information for the return value
-            and argument registers separately.  */
-         callee_loc[RETVAL] = EXTRACT_ARBITS (callee_ar, RETVAL);
-         caller_loc[RETVAL] = EXTRACT_ARBITS (caller_ar, RETVAL);
-         callee_loc[ARG0] = EXTRACT_ARBITS (callee_ar, ARG0);
-         caller_loc[ARG0] = EXTRACT_ARBITS (caller_ar, ARG0);
-         callee_loc[ARG1] = EXTRACT_ARBITS (callee_ar, ARG1);
-         caller_loc[ARG1] = EXTRACT_ARBITS (caller_ar, ARG1);
-         callee_loc[ARG2] = EXTRACT_ARBITS (callee_ar, ARG2);
-         caller_loc[ARG2] = EXTRACT_ARBITS (caller_ar, ARG2);
-         callee_loc[ARG3] = EXTRACT_ARBITS (callee_ar, ARG3);
-         caller_loc[ARG3] = EXTRACT_ARBITS (caller_ar, ARG3);
-
-         /* Check some special combinations.  For example, if FU 
-            appears in ARG1 or ARG3, we can move it to ARG0 or ARG2,
-            respectively.  (I guess this braindamage is correct?  It'd
-            take an hour or two of reading PA calling conventions to
-            really know).  */
-
-         if (caller_loc[ARG0] == AR_FU || caller_loc[ARG1] == AR_FU)
-           {
-             caller_loc[ARG0] = AR_DBL01;
-             caller_loc[ARG1] = AR_NO;
-           }
-         if (caller_loc[ARG2] == AR_FU || caller_loc[ARG3] == AR_FU)
-           {
-             caller_loc[ARG2] = AR_DBL23;
-             caller_loc[ARG3] = AR_NO;
-           }
-         if (callee_loc[ARG0] == AR_FU || callee_loc[ARG1] == AR_FU)
-           {
-             callee_loc[ARG0] = AR_DBL01;
-             callee_loc[ARG1] = AR_NO;
-           }
-         if (callee_loc[ARG2] == AR_FU || callee_loc[ARG3] == AR_FU)
-           {
-             callee_loc[ARG2] = AR_DBL23;
-             callee_loc[ARG3] = AR_NO;
-           }
+      h = elf_link_hash_lookup (elf_hash_table (info), "$global$",
+                               false, false, false);
 
-         /* Now look up potential mismatches.  */
-         stub_types[ARG0] = type_of_mismatch (caller_loc[ARG0],
-                                              callee_loc[ARG0],
-                                              ARGUMENTS);
-         stub_types[ARG1] = type_of_mismatch (caller_loc[ARG1],
-                                              callee_loc[ARG1],
-                                              ARGUMENTS);
-         stub_types[ARG2] = type_of_mismatch (caller_loc[ARG2],
-                                              callee_loc[ARG2],
-                                              ARGUMENTS);
-         stub_types[ARG3] = type_of_mismatch (caller_loc[ARG3],
-                                              callee_loc[ARG3],
-                                              ARGUMENTS);
-         stub_types[RETVAL] = type_of_mismatch (caller_loc[RETVAL],
-                                                callee_loc[RETVAL],
-                                                RETURN_VALUE);
-
-         /* If any of the arguments or return value need an argument
-            relocation, then we will need an argument relocation stub.  */
-         if (stub_types[ARG0] != NO_ARG_RELOC
-             || stub_types[ARG1] != NO_ARG_RELOC
-             || stub_types[ARG2] != NO_ARG_RELOC
-             || stub_types[ARG3] != NO_ARG_RELOC
-             || stub_types[RETVAL] != NO_ARG_RELOC)
-           return 1;
+      if (h != NULL
+         && h->root.type == bfd_link_hash_defined)
+       {
+         gp_val = h->root.u.def.value;
+         sec = h->root.u.def.section;
+       }
+      else
+       {
+         /* If $global$ isn't defined, we could make one up ourselves
+            from the start of .plt, .dlt, or .data  For the time
+            being, just bomb.  */
+         (*info->callbacks->undefined_symbol)
+           (info, "$global$", abfd, NULL, 0, true);
+         return false;
        }
+
+      elf32_hppa_hash_table (info)->global_value = (gp_val
+                                                   + sec->output_section->vma
+                                                   + sec->output_offset);
     }
-  return 0;
+
+  /* Invoke the standard linker.  */
+  return bfd_elf_bfd_final_link (abfd, info);
 }
 
-/* Create the linker stub section.  */
+/* Undo the generic ELF code's subtraction of section->vma from the
+   value of each external symbol.  */
 
-static void
-hppa_elf_create_stub_sec (abfd, output_bfd, secptr, link_info)
-     bfd *abfd;
-     bfd *output_bfd;
-     asection **secptr;
-     struct bfd_link_info *link_info;
+static boolean
+elf32_hppa_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     const Elf_Internal_Sym *sym ATTRIBUTE_UNUSED;
+     const char **namep ATTRIBUTE_UNUSED;
+     flagword *flagsp ATTRIBUTE_UNUSED;
+     asection **secp;
+     bfd_vma *valp;
 {
-  asection *output_text_section;
-  
-  output_text_section = bfd_get_section_by_name (output_bfd, ".text");
-  *secptr = bfd_make_section (abfd, ".hppa_linker_stubs");
-  bfd_set_section_flags (abfd, *secptr,
-                        SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD
-                        | SEC_RELOC | SEC_CODE | SEC_READONLY);
-  (*secptr)->output_section = output_text_section->output_section;
-  (*secptr)->output_offset = 0;
-  
-  /* Set up the ELF section header for this new section.  This
-     is basically the same processing as elf_make_sections().  
-     elf_make_sections is static and therefore not accessable
-     here.  */
-  {
-    Elf_Internal_Shdr *this_hdr;
-    this_hdr = &elf_section_data ((*secptr))->this_hdr;
-    
-    /* Set the sizes of this section.  The contents have already
-       been set up ?!?  */
-    this_hdr->sh_addr = (*secptr)->vma;
-    this_hdr->sh_size = (*secptr)->_raw_size;
-    
-    /* Set appropriate flags for sections with relocations.  */
-    if ((*secptr)->flags & SEC_RELOC)
-      {
-       Elf_Internal_Shdr *rela_hdr;
-       int use_rela_p = get_elf_backend_data (abfd)->use_rela_p;
-       
-       rela_hdr = &elf_section_data ((*secptr))->rel_hdr;
-       
-       if (use_rela_p)
-         {
-           rela_hdr->sh_type = SHT_RELA;
-           rela_hdr->sh_entsize = sizeof (Elf32_External_Rela);
-         }
-       else
-         {
-           rela_hdr->sh_type = SHT_REL;
-           rela_hdr->sh_entsize = sizeof (Elf32_External_Rel);
-         }
-       rela_hdr->sh_flags = 0;
-       rela_hdr->sh_addr = 0;
-       rela_hdr->sh_offset = 0;
-       rela_hdr->sh_addralign = 0;
-       rela_hdr->size = 0;
-      }
-    
-    if ((*secptr)->flags & SEC_ALLOC)
-      this_hdr->sh_flags |= SHF_ALLOC;
-    
-    if (!((*secptr)->flags & SEC_READONLY))
-      this_hdr->sh_flags |= SHF_WRITE;
-    
-    if ((*secptr)->flags & SEC_CODE)
-      this_hdr->sh_flags |= SHF_EXECINSTR;
-  }
-  
-  bfd_set_section_alignment (abfd, *secptr, 2);
+  *valp += (*secp)->vma;
+  return true;
 }
 
-/* Return nonzero if a long-call stub will be needed to call the
-   function (symbol in RELOC_ENTRY).  */
+/* Compute the size of the stub needed to call from INPUT_SEC (OFFSET)
+   to DESTINATION.  Return zero if no stub is needed to perform such a
+   call.  */
 
-static int
-hppa_elf_long_branch_needed_p (abfd, asec, reloc_entry, symbol, insn)
-     bfd *abfd;
-     asection *asec;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     unsigned insn;
+static unsigned int
+elf32_hppa_size_of_stub (input_sec, offset, destination)
+     asection *input_sec;
+     bfd_vma offset;
+     bfd_vma destination;
 {
-  long sym_value = get_symbol_value (symbol);
-  int fmt = reloc_entry->howto->bitsize;
-  unsigned char op = get_opcode (insn);
-  unsigned raddr;
-
-#define too_far(val,num_bits) \
-  ((int)(val) > (1 << (num_bits)) - 1) || ((int)(val) < (-1 << (num_bits)))
-
-  switch (op)
-    {
-    case BL:
-      raddr =
-       reloc_entry->address + asec->output_offset + asec->output_section->vma;
-      /* If the symbol and raddr (relocated addr?) are too far away from
-        each other, then a long-call stub will be needed.  */
-      if (too_far (sym_value - raddr, fmt + 1))
-         return 1;
-      break;
-    }  
+  bfd_vma location;
+
+  /* Determine where the call point is.  */
+  location = (input_sec->output_offset
+             + input_sec->output_section->vma
+             + offset);
+
+  /* Determine if a long branch stub is needed.  parisc branch offsets
+     are relative to the second instruction past the branch, ie. +8
+     bytes on from the branch instruction location.  The offset is
+     signed, 17 bits wide, and counts in units of 4 bytes.
+     bfd_vma is unsigned, so this is testing for offsets outside the
+     range -0x40000 to +0x3ffff  */
+  if (destination - location - 8 + 0x40000 >= 0x80000)
+    return 8;
   return 0;
 }
 
-/* Search the given section and determine if linker stubs will be
-   needed for any calls within that section.
+/* Build one linker stub as defined by the stub hash table entry GEN_ENTRY.
+   IN_ARG contains the link info pointer.  */
 
-   Return any new stub symbols created.
+#define LDIL_R1                0x20200000      /* ldil LR'XXX,%r1        */
+#define BE_SR4_R1      0xe0202002      /* be,n RR'XXX(%sr4,%r1)  */
 
-   Used out of hppaelf.em in the linker.  */
-   
-asymbol *
-hppa_look_for_stubs_in_section (stub_bfd, abfd, output_bfd, asec,
-                               new_sym_cnt, link_info)
-     bfd *stub_bfd;
-     bfd *abfd;
-     bfd *output_bfd;
-     asection *asec;
-     int *new_sym_cnt;
-     struct bfd_link_info *link_info;
+static boolean
+elf32_hppa_build_one_stub (gen_entry, in_arg)
+     struct bfd_hash_entry *gen_entry;
+     PTR in_arg;
 {
-  int i;
-  arg_reloc_type stub_types[5];
-  asymbol *new_syms = NULL;
-  int new_cnt = 0;
-  int new_max = 0;
-  arelent **reloc_vector = NULL;
-
-  /* Relocations are in different places depending on whether this is
-     an output section or an input section.  Also, the relocations are
-     in different forms.  Sigh.  Luckily, we have bfd_canonicalize_reloc()
-     to straighten this out for us . */
-  if (asec->reloc_count > 0)
-    {
-      reloc_vector
-       = (arelent **) malloc (asec->reloc_count * (sizeof (arelent *) + 1));
-      if (reloc_vector == NULL)
-       {
-         bfd_set_error (bfd_error_no_memory);
-         goto error_return;
-       }
+  struct elf32_hppa_stub_hash_entry *stub_entry;
+  struct elf32_hppa_link_hash_table *hppa_link_hash;
+  asection *stub_sec;
+  bfd *stub_bfd;
+  bfd_byte *loc;
+  symvalue sym_value;
+  int insn;
 
-      /* Make sure the canonical symbols are hanging around in a convient
-        location.  */
-      if (bfd_get_outsymbols (abfd) == NULL)
-       {
-         long symsize;
-         long symcount;
-
-         symsize = bfd_get_symtab_upper_bound (abfd);
-         if (symsize < 0)
-           goto error_return;
-         abfd->outsymbols = (asymbol **) bfd_alloc (abfd, symsize);
-         if (!abfd->outsymbols && symsize != 0)
-           {
-             bfd_set_error (bfd_error_no_memory);
-             goto error_return;
-           }
-         symcount = bfd_canonicalize_symtab (abfd, abfd->outsymbols);
-         if (symcount < 0)
-           goto error_return;
-         abfd->symcount = symcount;
-       }
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_hppa_stub_hash_entry *) gen_entry;
+  hppa_link_hash = (struct elf32_hppa_link_hash_table *) in_arg;
 
-      /* Now get the relocations.  */
-      if (bfd_canonicalize_reloc (abfd, asec, reloc_vector,
-                                 bfd_get_outsymbols (abfd)) < 0)
-       goto error_return;
+  stub_sec = stub_entry->stub_sec;
 
-      /* Examine each relocation entry in this section.  */
-      for (i = 0; i < asec->reloc_count; i++)
-       {
-         arelent *rle = reloc_vector[i];
+  /* Make a note of the offset within the stubs for this entry.  */
+  stub_entry->offset = hppa_link_hash->offset[stub_sec->index];
+  loc = stub_sec->contents + stub_entry->offset;
 
-         switch (rle->howto->type)
-           {
-           /* Any call could need argument relocation stubs, and
-              some may need long-call stubs.  */
-           case R_HPPA_ABS_CALL_11:
-           case R_HPPA_ABS_CALL_14:
-           case R_HPPA_ABS_CALL_17:
-           case R_HPPA_ABS_CALL_L21:
-           case R_HPPA_ABS_CALL_R11:
-           case R_HPPA_ABS_CALL_R14:
-           case R_HPPA_ABS_CALL_R17:
-           case R_HPPA_ABS_CALL_LS21:
-           case R_HPPA_ABS_CALL_RS11:
-           case R_HPPA_ABS_CALL_RS14:
-           case R_HPPA_ABS_CALL_RS17:
-           case R_HPPA_ABS_CALL_LD21:
-           case R_HPPA_ABS_CALL_RD11:
-           case R_HPPA_ABS_CALL_RD14:
-           case R_HPPA_ABS_CALL_RD17:
-           case R_HPPA_ABS_CALL_LR21:
-           case R_HPPA_ABS_CALL_RR14:
-           case R_HPPA_ABS_CALL_RR17:
-           case R_HPPA_PCREL_CALL_11:
-           case R_HPPA_PCREL_CALL_14:
-           case R_HPPA_PCREL_CALL_17:
-           case R_HPPA_PCREL_CALL_12:
-           case R_HPPA_PCREL_CALL_L21:
-           case R_HPPA_PCREL_CALL_R11:
-           case R_HPPA_PCREL_CALL_R14:
-           case R_HPPA_PCREL_CALL_R17:
-           case R_HPPA_PCREL_CALL_LS21:
-           case R_HPPA_PCREL_CALL_RS11:
-           case R_HPPA_PCREL_CALL_RS14:
-           case R_HPPA_PCREL_CALL_RS17:
-           case R_HPPA_PCREL_CALL_LD21:
-           case R_HPPA_PCREL_CALL_RD11:
-           case R_HPPA_PCREL_CALL_RD14:
-           case R_HPPA_PCREL_CALL_RD17:
-           case R_HPPA_PCREL_CALL_LR21:
-           case R_HPPA_PCREL_CALL_RR14:
-           case R_HPPA_PCREL_CALL_RR17:
-             {
-               symext_entryS caller_ar
-                 = (symext_entryS) HPPA_R_ARG_RELOC (rle->addend);
-               unsigned insn[2];
-
-               /* We'll need this for the long-call checks.  */
-               bfd_get_section_contents (abfd, asec, insn, rle->address,
-                                         sizeof(insn));
-
-               /* See if this call needs an argument relocation stub.  */
-               if (hppa_elf_arg_reloc_needed_p (abfd, rle, stub_types,
-                                                caller_ar))
-                 {
-                   /* Generate a stub and keep track of the new symbol.  */
-                   asymbol *r;
-
-                   if (new_cnt == new_max)
-                     {
-                       new_max += STUB_SYM_BUFFER_INC;
-                       new_syms = (asymbol *)
-                         realloc (new_syms, new_max * sizeof (asymbol));
-                       if (new_syms == NULL)
-                         {
-                           bfd_set_error (bfd_error_no_memory);
-                           goto error_return;
-                         }
-                     }
-
-                   /* Build the argument relocation stub.  */
-                   r = hppa_elf_build_linker_stub (stub_bfd, output_bfd,
-                                                   link_info, rle,
-                                                   stub_types, true, insn, 
-                                                   HPPA_STUB_ARG_RELOC);
-                   new_syms[new_cnt++] = *r;
-                 }
-
-               /* See if this call needs a long-call stub.  */
-               if (hppa_elf_long_branch_needed_p (abfd, asec, rle,
-                                                  rle->sym_ptr_ptr[0],
-                                                  insn[0]))
-                 {
-                   /* Generate a stub and keep track of the new symbol.  */
-                   asymbol *r;
-
-                   if (new_cnt == new_max)
-                     {
-                       new_max += STUB_SYM_BUFFER_INC;
-                       new_syms = (asymbol *)
-                         realloc (new_syms, (new_max * sizeof (asymbol)));
-                       if (! new_syms)
-                         {
-                           bfd_set_error (bfd_error_no_memory);
-                           goto error_return;
-                         }
-                     }
-
-                   /* Build the long-call stub.  */
-                   r = hppa_elf_build_linker_stub (stub_bfd, output_bfd,
-                                                   link_info, rle,
-                                                   NULL, true, insn, 
-                                                   HPPA_STUB_LONG_CALL);
-                   new_syms[new_cnt++] = *r;
-                 }
-             }
-             break;
+  sym_value = (stub_entry->target_value
+              + stub_entry->target_section->output_offset
+              + stub_entry->target_section->output_section->vma);
 
-           /* PLABELs may need argument relocation stubs.  */
-           case R_HPPA_PLABEL_32:
-           case R_HPPA_PLABEL_11:
-           case R_HPPA_PLABEL_14:
-           case R_HPPA_PLABEL_L21:
-           case R_HPPA_PLABEL_R11:
-           case R_HPPA_PLABEL_R14:
-             {
-               /* On a plabel relocation, assume the arguments of the
-                  caller are set up in general registers (indirect
-                  calls only use general registers.
-                  NOTE:  0x155 = ARGW0=GR,ARGW1=GR,ARGW2=GR,RETVAL=GR.  */
-               symext_entryS caller_ar = (symext_entryS) 0x155;
-               unsigned insn[2];
-
-               /* Do we really need this?  */
-               bfd_get_section_contents (abfd, asec, insn, rle->address,
-                                         sizeof(insn));
-
-               /* See if this call needs an argument relocation stub.  */
-               if (hppa_elf_arg_reloc_needed_p (abfd, rle, stub_types,
-                                                caller_ar))
-                 {
-                   /* Generate a plabel stub and keep track of the
-                      new symbol.  */
-                   asymbol *r;
-                   int rtn_adjust;
-
-                   if (new_cnt == new_max)
-                     {
-                       new_max += STUB_SYM_BUFFER_INC;
-                       new_syms = (asymbol *) realloc (new_syms, new_max
-                                                       * sizeof (asymbol));
-                     }
-
-                   /* Determine whether a return adjustment
-                      (see the relocation code for relocation type 
-                      R_HPPA_STUB_CALL_17) is possible.  Basically,
-                      determine whether we are looking at a branch or not.  */
-                   if (rle->howto->type == R_HPPA_PLABEL_32)
-                     rtn_adjust = false;
-                   else
-                     {
-                       switch (get_opcode(insn[0]))
-                         {
-                         case BLE:
-                         case BE:
-                           rtn_adjust = true;
-                           break;
-                         default:
-                           rtn_adjust = false;
-                         }
-                     }
-
-                   /* Build the argument relocation stub.  */
-                   r = hppa_elf_build_linker_stub (stub_bfd, output_bfd,
-                                                   link_info, rle, stub_types,
-                                                   rtn_adjust, insn,
-                                                   HPPA_STUB_ARG_RELOC);
-                   new_syms[new_cnt++] = *r;
-                 }
-             }
-             break;
+  stub_bfd = stub_sec->owner;
 
-           default:
-             break;
-           }
-       }
-    }
+  /* Create the long branch.  A long branch is formed with "ldil"
+     loading the upper bits of the target address into a register,
+     then branching with "be" which adds in the lower bits.
+     The "be" has its delay slot nullified.  */
+  insn = hppa_rebuild_insn (LDIL_R1,
+                           hppa_field_adjust (sym_value, 0, e_lrsel),
+                           21);
+  bfd_put_32 (stub_bfd, insn, loc);
+
+  insn = hppa_rebuild_insn (BE_SR4_R1,
+                           hppa_field_adjust (sym_value, 0, e_rrsel) >> 2,
+                           17);
+  bfd_put_32 (stub_bfd, insn, loc + 4);
+
+  hppa_link_hash->offset[stub_sec->index] += 8;
 
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  /* Return the new symbols and update the counters.  */
-  *new_sym_cnt = new_cnt;
-  return new_syms;
-
- error_return:
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  /* FIXME: This is bogus.  We should be returning NULL.  But do the callers
-     check for that?  */
-  abort ();
+  return true;
 }
 
-/* Set the contents of a particular section at a particular location.  */
+/* As above, but don't actually build the stub.  Just bump offset so
+   we know stub section sizes.  */
 
 static boolean
-hppa_elf_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
+elf32_hppa_size_one_stub (gen_entry, in_arg)
+     struct bfd_hash_entry *gen_entry;
+     PTR in_arg;
 {
-  /* Linker stubs are handled a little differently.  */
-  if (! strcmp (section->name, ".hppa_linker_stubs"))
-    {
-      if (linker_stubs_max_size < offset + count)
-       {
-         linker_stubs_max_size = offset + count + STUB_ALLOC_INCR;
-         linker_stubs = (char *)realloc (linker_stubs, linker_stubs_max_size);
-         if (! linker_stubs)
-           abort ();
-       }
+  struct elf32_hppa_stub_hash_entry *stub_entry;
+  struct elf32_hppa_link_hash_table *hppa_link_hash;
 
-      if (offset + count > linker_stubs_size)
-       linker_stubs_size = offset + count;
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_hppa_stub_hash_entry *) gen_entry;
+  hppa_link_hash = (struct elf32_hppa_link_hash_table *) in_arg;
 
-      /* Set the contents.  */
-      memcpy(linker_stubs + offset, location, count);
-      return (true);
-    }
-  else
-    /* For everything but the linker stub section, use the generic
-       code.  */
-    return bfd_elf32_set_section_contents (abfd, section, location,
-                                          offset, count);
+  hppa_link_hash->offset[stub_entry->stub_sec->index] += 8;
+
+  return true;
 }
 
-/* Get the contents of the given section.
-   
-   This is special for PA ELF because some sections (such as linker stubs)
-   may reside in memory rather than on disk, or in the case of the symbol
-   extension section, the contents may need to be generated from other
-   information contained in the BFD.  */
+/* External entry points for sizing and building linker stubs.  */
+
+/* Build all the stubs associated with the current output file.  The
+   stubs are kept in a hash table attached to the main linker hash
+   table.  This is called via hppaelf_finish in the linker.  */
 
 boolean
-hppa_elf_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
+elf32_hppa_build_stubs (stub_bfd, link_info)
+     bfd *stub_bfd;
+     struct bfd_link_info *link_info;
 {
-  /* If this is the linker stub section, then its contents are contained
-     in memory rather than on disk.  FIXME.  Is that always right?  What
-     about the case where a final executable is read in and a user tries
-     to get the contents of this section?  In that case the contents would
-     be on disk like everything else.  */
-  if (strcmp (section->name, ".hppa_linker_stubs") == 0)
-    {
-      elf32_hppa_stub_description *stub_desc = find_stubs (abfd, section);
-      
-      if (count == 0)
-       return true;
-      
-      /* Sanity check our arguments.  */
-      if ((bfd_size_type) (offset + count) > section->_raw_size
-         || (bfd_size_type) (offset + count) > stub_desc->real_size)
-       return (false);
-      
-      memcpy (location, stub_desc->stub_contents + offset, count);
-      return (true);
-    }
+  asection *stub_sec;
+  struct bfd_hash_table *table;
+  struct elf32_hppa_link_hash_table *hppa_link_hash;
 
-  /* The symbol extension section also needs special handling.  Its
-     contents might be on the disk, in memory, or still need to
-     be generated. */
-  else if (strcmp (section->name, ".hppa_symextn") == 0)
+  for (stub_sec = stub_bfd->sections; stub_sec; stub_sec = stub_sec->next)
     {
-      /* If there are no output sections, then read the contents of the
-        symbol extension section from disk.  */
-      if (section->output_section == NULL
-         && abfd->direction == read_direction)
-       {
-         return bfd_generic_get_section_contents (abfd, section, location,
-                                                  offset, count);
-       }
-      
-      /* If this is the first time through, and there are output sections,
-        then build the symbol extension section based on other information
-        contained in the BFD.  */
-      else if (! symext_chain_built)
-       {
-         int i;
-         int *symtab_map =
-           (int *) elf_sym_extra (section->output_section->owner);
-         
-         for (i = 0; i < section->output_section->owner->symcount; i++)
-           {
-             elf_hppa_tc_symbol (section->output_section->owner,
-                                 ((elf_symbol_type *)
-                                  section->output_section->owner->outsymbols[i]),
-                                 symtab_map[i], &symext_rootP, &symext_lastP);
-           }
-         symext_chain_built++;
-         elf_hppa_tc_make_sections (section->output_section->owner, 
-                                    symext_rootP);
-       }
+      unsigned int size;
 
-      /* At this point we know that the symbol extension section has been
-        built.  We just need to copy it into the user's buffer.  */
-      if (count == 0)
-       return true;
-      
-      /* Sanity check our arguments.  */
-      if ((bfd_size_type) (offset + count) > section->_raw_size
-         || (bfd_size_type) (offset + count) > symextn_contents_real_size)
-       return (false);
-      
-      memcpy (location,
-             (char *)symextn_contents + section->output_offset + offset,
-             count);
-      return (true);
+      /* Allocate memory to hold the linker stubs.  */
+      size = bfd_section_size (stub_bfd, stub_sec);
+      stub_sec->contents = (unsigned char *) bfd_zalloc (stub_bfd, size);
+      if (stub_sec->contents == NULL && size != 0)
+       return false;
     }
-  else
-    /* It's not the symbol extension or linker stub sections, use
-       the generic routines.  */
-    return bfd_generic_get_section_contents (abfd, section, location,
-                                            offset, count);
-}
 
-/* Translate from an elf into field into a howto relocation pointer.  */
+  /* Build the stubs as directed by the stub hash table.  */
+  hppa_link_hash = elf32_hppa_hash_table (link_info);
+  memset (hppa_link_hash->offset, 0,
+         stub_bfd->section_count * sizeof (bfd_vma));
 
-static void
-elf_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rela *dst;
-{
-  BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_HPPA_UNIMPLEMENTED);
-  cache_ptr->howto = &elf_hppa_howto_table[ELF32_R_TYPE (dst->r_info)];
+  table = &hppa_link_hash->stub_hash_table;
+  bfd_hash_traverse (table, elf32_hppa_build_one_stub, hppa_link_hash);
+
+  return true;
 }
 
-/* Do PA ELF specific processing for symbols.  Needed to find the
-   value of $global$.  */
+/* Determine and set the size of the stub section for a final link.
 
-static void
-elf32_hppa_backend_symbol_processing (abfd, sym)
-     bfd *abfd;
-     asymbol *sym;
-{
-  /* Is this a definition of $global$?  If so, keep it because it will be
-    needed if any relocations are performed.  */
-  if (!strcmp (sym->name, "$global$")
-      && sym->section != &bfd_und_section)
-    {
-      global_symbol = sym;
-    }
-}
+   The basic idea here is to examine all the relocations looking for
+   PC-relative calls to a target that is unreachable with a "bl"
+   instruction or calls where the caller and callee disagree on the
+   location of their arguments or return value.  Currently, we don't
+   support elf arg relocs.  */
 
-/* Do some PA ELF specific work after reading in the symbol table.
-   In particular attach the argument relocation from the 
-   symbol extension section to the appropriate symbols.  */
-static boolean
-elf32_hppa_backend_symbol_table_processing (abfd, esyms,symcnt)
-     bfd *abfd;
-     elf_symbol_type *esyms;
-     int symcnt;
+boolean
+elf32_hppa_size_stubs (stub_bfd, link_info,
+                      add_stub_section, layout_sections_again)
+     bfd *stub_bfd;
+     struct bfd_link_info *link_info;
+     asection * (*add_stub_section) PARAMS ((const char *, asection *));
+     void (*layout_sections_again) PARAMS ((void));
 {
-  Elf32_Internal_Shdr *symextn_hdr =
-    bfd_elf_find_section (abfd, SYMEXTN_SECTION_NAME);
-  int i, current_sym_idx = 0;
-
-  /* If no symbol extension existed, then all symbol extension information
-     is assumed to be zero.  */
-  if (symextn_hdr == NULL)
+  bfd *input_bfd;
+  asection *section;
+  Elf_Internal_Sym *local_syms, **all_local_syms;
+  asection **stub_section_created;
+  unsigned int i, indx, bfd_count, sec_count;
+  asection *stub_sec;
+  asection *first_init_sec = NULL;
+  asection *first_fini_sec = NULL;
+  struct elf32_hppa_link_hash_table *hppa_link_hash;
+  struct bfd_hash_table *stub_hash_table;
+  boolean stub_changed;
+
+  /* Count the number of input BFDs and the total number of input sections.  */
+  for (input_bfd = link_info->input_bfds, bfd_count = 0, sec_count = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
     {
-      for (i = 0; i < symcnt; i++)
-       esyms[i].tc_data.hppa_arg_reloc = 0;
-      return (true);
+      bfd_count += 1;
+      sec_count += input_bfd->section_count;
     }
 
-  /* Allocate a buffer of the appropriate size for the symextn section.  */
-  symextn_hdr->contents = bfd_zalloc(abfd,symextn_hdr->sh_size);
-  if (!symextn_hdr->contents)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
-  symextn_hdr->size = symextn_hdr->sh_size;
-       
-  /* Read in the symextn section.  */
-  if (bfd_seek (abfd, symextn_hdr->sh_offset, SEEK_SET) == -1)
-    return false;
-  if (bfd_read ((PTR) symextn_hdr->contents, 1, symextn_hdr->size, abfd) 
-      != symextn_hdr->size)
+  stub_section_created
+    = (asection **) bfd_zmalloc (sizeof (asection *) * sec_count);
+  if (stub_section_created == NULL)
     return false;
 
-  /* Parse entries in the symbol extension section, updating the symtab
-     entries as we go */
-  for (i = 0; i < symextn_hdr->size / sizeof(symext_entryS); i++)
+  /* We want to read in symbol extension records only once.  To do this
+     we need to read in the local symbols in parallel and save them for
+     later use; so hold pointers to the local symbols in an array.  */
+  all_local_syms
+    = (Elf_Internal_Sym **) bfd_zmalloc (sizeof (Elf_Internal_Sym *)
+                                        * bfd_count);
+  if (all_local_syms == NULL)
+    goto error_ret_free_stub;
+
+  /* Walk over all the input BFDs adding entries to the args hash table
+     for all the external functions.  */
+  for (input_bfd = link_info->input_bfds, indx = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next, indx++)
     {
-      symext_entryS *seP = ((symext_entryS *)symextn_hdr->contents) + i;
-      int se_value = ELF32_HPPA_SX_VAL (*seP);
-      int se_type = ELF32_HPPA_SX_TYPE (*seP);
-
-      switch (se_type)
+      Elf_Internal_Shdr *symtab_hdr;
+      Elf_Internal_Sym *isym;
+      Elf32_External_Sym *ext_syms, *esym;
+
+      /* We'll need the symbol table in a second.  */
+      symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+      if (symtab_hdr->sh_info == 0)
+       continue;
+
+      /* We need an array of the local symbols attached to the input bfd.
+        Unfortunately, we're going to have to read & swap them in.  */
+      local_syms = (Elf_Internal_Sym *)
+       bfd_malloc (symtab_hdr->sh_info * sizeof (Elf_Internal_Sym));
+      if (local_syms == NULL)
        {
-       case HPPA_SXT_NULL:
-         break;
+         goto error_ret_free_local;
+       }
+      all_local_syms[indx] = local_syms;
+      ext_syms = (Elf32_External_Sym *)
+       bfd_malloc (symtab_hdr->sh_info * sizeof (Elf32_External_Sym));
+      if (ext_syms == NULL)
+       {
+         goto error_ret_free_local;
+       }
 
-       case HPPA_SXT_SYMNDX:
-         if (se_value >= symcnt)
-           {
-             bfd_set_error (bfd_error_bad_value);
-             return (false);
-           }
-         current_sym_idx = se_value - 1;
-         break;
+      if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
+          || (bfd_read (ext_syms, 1,
+                       (symtab_hdr->sh_info * sizeof (Elf32_External_Sym)),
+                       input_bfd)
+             != (symtab_hdr->sh_info * sizeof (Elf32_External_Sym))))
+       {
+         free (ext_syms);
+         goto error_ret_free_local;
+       }
 
-       case HPPA_SXT_ARG_RELOC:
-         esyms[current_sym_idx].tc_data.hppa_arg_reloc = se_value;
-         break;
+      /* Swap the local symbols in.  */
+      isym = local_syms;
+      esym = ext_syms;
+      for (i = 0; i < symtab_hdr->sh_info; i++, esym++, isym++)
+       bfd_elf32_swap_symbol_in (input_bfd, esym, isym);
 
-       default:
-         bfd_set_error (bfd_error_bad_value);
-         return (false);
-       }
+      /* Now we can free the external symbols.  */
+      free (ext_syms);
     }
-  return (true);
-}
 
-/* Perform on PA ELF specific processing once a section has been
-   read in.  In particular keep the symbol indexes correct for
-   the symbol extension information.  */
-
-static boolean
-elf32_hppa_backend_section_processing (abfd, secthdr)
-     bfd *abfd;
-     Elf32_Internal_Shdr *secthdr;
-{
-  int i, j, k;
+  stub_hash_table = &elf32_hppa_hash_table (link_info)->stub_hash_table;
 
-  if (secthdr->sh_type == SHT_HPPA_SYMEXTN)
+  while (1)
     {
-      for (i = 0; i < secthdr->size / sizeof (symext_entryS); i++)
+      stub_changed = 0;
+
+      /* Now that we have argument location information for all the
+        global functions we can start looking for stubs.  */
+      for (input_bfd = link_info->input_bfds, indx = 0, sec_count = 0;
+          input_bfd != NULL;
+          input_bfd = input_bfd->link_next, indx++)
        {
-         symext_entryS *seP = ((symext_entryS *)secthdr->contents) + i;
-         int se_value = ELF32_HPPA_SX_VAL (*seP);
-         int se_type = ELF32_HPPA_SX_TYPE (*seP);
-         
-         switch (se_type)
+         Elf_Internal_Shdr *symtab_hdr;
+
+         /* We'll need the symbol table in a second.  */
+         symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+         if (symtab_hdr->sh_info == 0)
+           continue;
+
+         local_syms = all_local_syms[indx];
+
+         /* Walk over each section attached to the input bfd.  */
+         for (section = input_bfd->sections;
+              section != NULL;
+              section = section->next, sec_count++)
            {
-           case HPPA_SXT_NULL:
-             break;
-             
-           case HPPA_SXT_SYMNDX:
-             for (j = 0; j < abfd->symcount; j++)
+             Elf_Internal_Shdr *input_rel_hdr;
+             Elf32_External_Rela *external_relocs, *erelaend, *erela;
+             Elf_Internal_Rela *internal_relocs, *irelaend, *irela;
+
+             /* If there aren't any relocs, then there's nothing to do.  */
+             if ((section->flags & SEC_RELOC) == 0
+                 || section->reloc_count == 0)
+               continue;
+
+             /* Allocate space for the external relocations.  */
+             external_relocs
+               = ((Elf32_External_Rela *)
+                  bfd_malloc (section->reloc_count
+                              * sizeof (Elf32_External_Rela)));
+             if (external_relocs == NULL)
                {
-                 /* Locate the map entry for this symbol and modify the
-                    symbol extension section symbol index entry to reflect
-                    the new symbol table index.  */
-                 for (k = 0; k < elf32_hppa_symextn_map_size; k++)
-                   {
-                     if (elf32_hppa_symextn_map[k].old_index == se_value
-                         && elf32_hppa_symextn_map[k].bfd
-                            == abfd->outsymbols[j]->the_bfd
-                         && elf32_hppa_symextn_map[k].sym
-                            == abfd->outsymbols[j])
-                       {
-                         bfd_put_32(abfd,
-                                    ELF32_HPPA_SX_WORD (HPPA_SXT_SYMNDX, j),
-                                    (char *)seP);
-                       }
-                   }
+                 goto error_ret_free_local;
                }
-             break;
-             
-           case HPPA_SXT_ARG_RELOC:
-             break;
-             
-           default:
-             bfd_set_error (bfd_error_bad_value);
-             return (false);
-           }
-       }
-    }
-  return true;
-}
 
-/* What does this really do?  Just determine if there is an appropriate
-   mapping from ELF section headers to backend sections?  More symbol
-   extension braindamage.  */
+             /* Likewise for the internal relocations.  */
+             internal_relocs = ((Elf_Internal_Rela *)
+                                bfd_malloc (section->reloc_count
+                                            * sizeof (Elf_Internal_Rela)));
+             if (internal_relocs == NULL)
+               {
+                 free (external_relocs);
+                 goto error_ret_free_local;
+               }
 
-static boolean
-elf32_hppa_backend_section_from_shdr (abfd, hdr, name)
-     bfd *abfd;
-     Elf32_Internal_Shdr *hdr;
-     char *name;
-{
-  asection *newsect;
+             /* Read in the external relocs.  */
+             input_rel_hdr = &elf_section_data (section)->rel_hdr;
+             if (bfd_seek (input_bfd, input_rel_hdr->sh_offset, SEEK_SET) != 0
+                 || bfd_read (external_relocs, 1,
+                              input_rel_hdr->sh_size,
+                              input_bfd) != input_rel_hdr->sh_size)
+               {
+                 free (external_relocs);
+               error_ret_free_internal:
+                 free (internal_relocs);
+                 goto error_ret_free_local;
+               }
 
-  if (hdr->sh_type == SHT_HPPA_SYMEXTN)
-    {
-      BFD_ASSERT (strcmp (name, ".hppa_symextn") == 0);
+             /* Swap in the relocs.  */
+             erela = external_relocs;
+             erelaend = erela + section->reloc_count;
+             irela = internal_relocs;
+             for (; erela < erelaend; erela++, irela++)
+               bfd_elf32_swap_reloca_in (input_bfd, erela, irela);
 
-      /* Bits that get saved. This one is real.  */
-      if (!hdr->rawdata)
-       {
-         newsect = bfd_make_section (abfd, name);
-         if (newsect != NULL)
-           {
-             newsect->vma = hdr->sh_addr;
-             newsect->_raw_size = hdr->sh_size;
-             newsect->filepos = hdr->sh_offset;
-             newsect->flags |= SEC_HAS_CONTENTS;
-             newsect->alignment_power = hdr->sh_addralign;
+             /* We're done with the external relocs, free them.  */
+             free (external_relocs);
 
-             if (hdr->sh_flags & SHF_ALLOC)
+             /* Now examine each relocation.  */
+             irela = internal_relocs;
+             irelaend = irela + section->reloc_count;
+             for (; irela < irelaend; irela++)
                {
-                 newsect->flags |= SEC_ALLOC;
-                 newsect->flags |= SEC_LOAD;
-               }
+                 unsigned int r_type, r_indx, size_of_stub;
+                 struct elf32_hppa_stub_hash_entry *stub_entry;
+                 asection *sym_sec;
+                 const char *sym_name;
+                 symvalue sym_value;
+                 bfd_vma destination;
+                 struct elf_link_hash_entry *hash;
+                 char *stub_name;
+
+                 r_type = ELF32_R_TYPE (irela->r_info);
+                 r_indx = ELF32_R_SYM (irela->r_info);
+
+                 if (r_type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
+                   {
+                     bfd_set_error (bfd_error_bad_value);
+                     goto error_ret_free_internal;
+                   }
 
-             if (!(hdr->sh_flags & SHF_WRITE))
-               newsect->flags |= SEC_READONLY;
+                 /* Only look for stubs on call instructions.  */
+                 if (r_type != (unsigned int) R_PARISC_PCREL17F)
+                   continue;
 
-             if (hdr->sh_flags & SHF_EXECINSTR)
-               newsect->flags |= SEC_CODE;
-             else
-               newsect->flags |= SEC_DATA;
+                 /* Now determine the call target, its name, value, section
+                    and argument relocation bits.  */
+                 sym_sec = NULL;
+                 hash = NULL;
+                 if (r_indx < symtab_hdr->sh_info)
+                   {
+                     /* It's a local symbol.  */
+                     Elf_Internal_Sym *sym;
+                     Elf_Internal_Shdr *hdr;
+
+                     sym = local_syms + r_indx;
+                     hdr = elf_elfsections (input_bfd)[sym->st_shndx];
+                     sym_sec = hdr->bfd_section;
+                     sym_name =
+                       bfd_elf_string_from_elf_section (input_bfd,
+                                                        symtab_hdr->sh_link,
+                                                        sym->st_name);
+                     sym_value = (ELF_ST_TYPE (sym->st_info) == STT_SECTION
+                                  ? 0 : sym->st_value);
+                     destination = (sym_value + irela->r_addend
+                                    + sym_sec->output_offset
+                                    + sym_sec->output_section->vma);
+                   }
+                 else
+                   {
+                     /* It's an external symbol.  */
+                     int e_indx;
 
-             hdr->rawdata = (void *) newsect;
-           }
-       }
-      return true;
-    }
-  return false;
-}
+                     e_indx = r_indx - symtab_hdr->sh_info;
+                     hash = elf_sym_hashes (input_bfd)[e_indx];
 
-/* Return true if the given section is a fake section.  */
+                     while (hash->root.type == bfd_link_hash_indirect
+                            || hash->root.type == bfd_link_hash_warning)
+                       hash = (struct elf_link_hash_entry *)
+                         hash->root.u.i.link;
 
-static boolean
-elf32_hppa_backend_fake_sections (abfd, secthdr, asect)
-     bfd *abfd;
-     Elf_Internal_Shdr *secthdr;
-     asection *asect;
-{
+                     if (hash->root.type == bfd_link_hash_undefined
+                         || hash->root.type == bfd_link_hash_undefweak)
+                       continue;
 
-  if (strcmp(asect->name, ".hppa_symextn") == 0)
-    {
-      secthdr->sh_type = SHT_HPPA_SYMEXTN;
-      secthdr->sh_flags = 0;
-      secthdr->sh_info = elf_section_data(asect)->rel_hdr.sh_link;
-      secthdr->sh_link = elf_onesymtab(abfd);
-      return true;
-    }
+                     if (hash->root.type == bfd_link_hash_defined
+                         || hash->root.type == bfd_link_hash_defweak)
+                       {
+                         sym_sec = hash->root.u.def.section;
+                         sym_name = hash->root.root.string;
+                         sym_value = hash->root.u.def.value;
+                         destination = (sym_value + irela->r_addend
+                                        + sym_sec->output_offset
+                                        + sym_sec->output_section->vma);
+                       }
+                     else
+                       {
+                         bfd_set_error (bfd_error_bad_value);
+                         goto error_ret_free_internal;
+                       }
+                   }
 
-  if (!strcmp (asect->name, ".hppa_unwind"))
-    {
-      secthdr->sh_type = SHT_PROGBITS;
-      /* Unwind descriptors are not part of the program memory image.  */
-      secthdr->sh_flags = 0;
-      secthdr->sh_info = 0;
-      secthdr->sh_link = 0;
-      secthdr->sh_entsize = 16;
-      return true;
-    }
+                 /* Determine what (if any) linker stub is needed and its
+                    size (in bytes).  */
+                 size_of_stub = elf32_hppa_size_of_stub (section,
+                                                         irela->r_offset,
+                                                         destination);
+                 if (size_of_stub == 0)
+                   continue;
 
-  /* @@ Should this be CPU specific??  KR */
-  if (!strcmp (asect->name, ".stabstr"))
-    {
-      secthdr->sh_type = SHT_STRTAB;
-      secthdr->sh_flags = 0;
-      secthdr->sh_info = 0;
-      secthdr->sh_link = 0;
-      secthdr->sh_entsize = 0;
-      return true;
-    }
+                 /* Get the name of this stub.  */
+                 stub_name = elf32_hppa_stub_name (sym_name,
+                                                   sym_sec,
+                                                   section,
+                                                   irela->r_addend,
+                                                   hash);
+                 if (!stub_name)
+                   goto error_ret_free_internal;
+
+                 stub_entry = elf32_hppa_stub_hash_lookup (stub_hash_table,
+                                                           stub_name,
+                                                           false,
+                                                           false);
+                 if (stub_entry != NULL)
+                   {
+                     /* The proper stub has already been created.  */
+                     free (stub_name);
+                     continue;
+                   }
 
-  return false;
-}
+                 stub_sec = stub_section_created[sec_count];
+                 if (stub_sec == NULL)
+                   {
+                     char *s_name;
+                     int nstub;
+                     int special_sec = 0;
+
+                     /* We only want one stub for .init and .fini
+                        because glibc splits the _init and _fini
+                        functions into two parts.  We don't want to
+                        put a stub in the middle of a function.  */ 
+                     if (strncmp (section->name, ".init", 5) == 0)
+                       {
+                         stub_sec = first_init_sec;
+                         special_sec = 1;
+                       }
+                     else if (strncmp (section->name, ".fini", 5) == 0)
+                       {
+                         stub_sec = first_fini_sec;
+                         special_sec = 2;
+                       }
+                     if (stub_sec == NULL)
+                       {
+                         s_name = bfd_alloc (stub_bfd, 16);
+                         if (s_name == NULL)
+                           {
+                             free (stub_name);
+                             goto error_ret_free_internal;
+                           }
+                         nstub = stub_bfd->section_count;
+                         sprintf (s_name, ".stub_%x", nstub);
+                         stub_sec = (*add_stub_section) (s_name, section);
+                         if (stub_sec == NULL)
+                           {
+                             free (stub_name);
+                             goto error_ret_free_internal;
+                           }
+                         if (special_sec != 0)
+                           {
+                             if (special_sec == 1)
+                               first_init_sec = stub_sec;
+                             else
+                               first_fini_sec = stub_sec;
+                           }
+                       }
+                     stub_section_created[sec_count] = stub_sec;
+                   }
 
-/* Return true if there is a mapping from bfd section into a
-   backend section.  */
+                 /* Enter this entry into the linker stub
+                    hash table.  */
+                 stub_entry = elf32_hppa_stub_hash_lookup (stub_hash_table,
+                                                           stub_name,
+                                                           true,
+                                                           false);
+                 if (stub_entry == NULL)
+                   {
+                     (*_bfd_error_handler)
+                       (_("%s: cannot find stub entry %s"),
+                        bfd_get_filename (section->owner),
+                        stub_name);
+                     free (stub_name);
+                     goto error_ret_free_internal;
+                   }
 
-static boolean
-elf32_hppa_backend_section_from_bfd_section (abfd, hdr, asect, ignored)
-     bfd *abfd;
-     Elf32_Internal_Shdr *hdr;
-     asection *asect;
-     int *ignored;
-{
-  if (hdr->sh_type == SHT_HPPA_SYMEXTN)
-    {
-      if (hdr->rawdata)
-       {
-         if (((struct sec *) (hdr->rawdata)) == asect)
-           {
-             BFD_ASSERT (strcmp (asect->name, ".hppa_symextn") == 0);
-             return true;
+                 /* We'll need these to determine the address
+                    that the stub will branch to.  */
+                 stub_entry->stub_sec = stub_sec;
+                 stub_entry->offset = 0;
+                 stub_entry->target_value = sym_value;
+                 stub_entry->target_section = sym_sec;
+                 stub_changed = 1;
+               }
+             /* We're done with the internal relocs, free them.  */
+             free (internal_relocs);
            }
        }
-    }
-  else if (hdr->sh_type == SHT_STRTAB)
-    {
-      if (hdr->rawdata)
+
+      if (!stub_changed)
+       break;
+
+      /* OK, we've added some stubs.  Find out the new size of the
+        stub sections.  */
+      hppa_link_hash = elf32_hppa_hash_table (link_info);
+      hppa_link_hash->offset = (bfd_vma *)
+       bfd_realloc (hppa_link_hash->offset,
+                    stub_bfd->section_count * sizeof (bfd_vma));
+      if (hppa_link_hash->offset == NULL)
+       goto error_ret_free_local;
+
+      memset (hppa_link_hash->offset, 0,
+             stub_bfd->section_count * sizeof (bfd_vma));
+
+      bfd_hash_traverse (stub_hash_table,
+                        elf32_hppa_size_one_stub,
+                        hppa_link_hash);
+
+      for (stub_sec = stub_bfd->sections;
+          stub_sec != NULL;
+          stub_sec = stub_sec->next)
        {
-         if (((struct sec *) (hdr->rawdata)) == asect)
-           {
-             BFD_ASSERT (strcmp (asect->name, ".stabstr") == 0);
-             return true;
-           }
+         bfd_set_section_size (stub_bfd, stub_sec,
+                               hppa_link_hash->offset[stub_sec->index]);
        }
+      /* Ask the linker to do its stuff.  */
+      (*layout_sections_again) ();
     }
 
-  return false;
-}
+  /* We're done with the local symbols, free them.  */
+  for (i = 0; i < bfd_count; i++)
+    if (all_local_syms[i])
+      free (all_local_syms[i]);
+  free (all_local_syms);
+  free (stub_section_created);
+  return true;
 
-#define bfd_elf32_bfd_reloc_type_lookup        elf_hppa_reloc_type_lookup
-#define elf_backend_section_from_bfd_section   elf32_hppa_backend_section_from_bfd_section
+ error_ret_free_local:
+  for (i = 0; i < bfd_count; i++)
+    if (all_local_syms[i])
+      free (all_local_syms[i]);
+  free (all_local_syms);
 
-#define elf_backend_symbol_processing  elf32_hppa_backend_symbol_processing
-#define elf_backend_symbol_table_processing    elf32_hppa_backend_symbol_table_processing
+ error_ret_free_stub:
+  free (stub_section_created);
+  return false;
+}
 
-#define bfd_generic_get_section_contents       hppa_elf_get_section_contents
-#define bfd_elf32_set_section_contents         hppa_elf_set_section_contents
-#define bfd_elf32_bfd_is_local_label           hppa_elf_is_local_label
+/* Misc BFD support code.  */
+#define bfd_elf32_bfd_reloc_type_lookup                elf_hppa_reloc_type_lookup
+#define bfd_elf32_bfd_is_local_label_name      elf_hppa_is_local_label_name
+#define elf_info_to_howto                      elf_hppa_info_to_howto
+#define elf_info_to_howto_rel                  elf_hppa_info_to_howto_rel
 
-#define elf_backend_section_processing elf32_hppa_backend_section_processing
+/* Stuff for the BFD linker.  */
+#define elf_backend_relocate_section           elf32_hppa_relocate_section
+#define elf_backend_add_symbol_hook            elf32_hppa_add_symbol_hook
+#define bfd_elf32_bfd_final_link               elf32_hppa_final_link
+#if 0
+#define elf_backend_check_relocs               elf32_hppa_check_relocs
+#endif
+#define bfd_elf32_bfd_link_hash_table_create \
+  elf32_hppa_link_hash_table_create
+#define elf_backend_fake_sections              elf_hppa_fake_sections
 
-#define elf_backend_section_from_shdr  elf32_hppa_backend_section_from_shdr
-#define elf_backend_fake_sections      elf32_hppa_backend_fake_sections
 
 #define TARGET_BIG_SYM         bfd_elf32_hppa_vec
 #define TARGET_BIG_NAME                "elf32-hppa"
 #define ELF_ARCH               bfd_arch_hppa
-#define ELF_MACHINE_CODE       EM_HPPA
+#define ELF_MACHINE_CODE       EM_PARISC
 #define ELF_MAXPAGESIZE                0x1000
 
 #include "elf32-target.h"
This page took 0.141689 seconds and 4 git commands to generate.