Touches most files in bfd/, so likely will be blamed for everything..
[deliverable/binutils-gdb.git] / bfd / elf32-hppa.c
index 74399a867270e4931b1eb33d4889a3001e5276d0..68a956c079e5649be0162a877445d83181b442d6 100644 (file)
@@ -1,11 +1,12 @@
 /* BFD back-end for HP PA-RISC ELF files.
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
-
-   Written by
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
+   Original code by
        Center for Software Science
        Department of Computer Science
        University of Utah
+   Largely rewritten by Alan Modra <alan@linuxcare.com.au>
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -21,3310 +22,4456 @@ 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"
-
-/* 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.  */
-
-#include "elf32-hppa.h"
+#include "elf-bfd.h"
+#include "elf/hppa.h"
 #include "libhppa.h"
-#include "aout/aout64.h"
-#include "hppa_stubs.h"
+#include "elf32-hppa.h"
+#define ARCH_SIZE              32
+#include "elf-hppa.h"
+#include "elf32-hppa.h"
 
-/* The basic stub types supported.  If/when shared libraries are
-   implemented some form of IMPORT and EXPORT stubs will be needed.  */
-typedef enum
+/* In order to gain some understanding of code in this file without
+   knowing all the intricate details of the linker, note the
+   following:
+
+   Functions named elf32_hppa_* are called by external routines, other
+   functions are only called locally.  elf32_hppa_* functions appear
+   in this file more or less in the order in which they are called
+   from external routines.  eg. elf32_hppa_check_relocs is called
+   early in the link process, elf32_hppa_finish_dynamic_sections is
+   one of the last functions.  */
+
+/* We use two hash tables to hold information for linking PA ELF objects.
+
+   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 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.
+
+   There are a number of different stubs generated by the linker.
+
+   Long branch stub:
+   :           ldil LR'X,%r1
+   :           be,n RR'X(%sr4,%r1)
+
+   PIC long branch stub:
+   :           b,l .+8,%r1
+   :           addil LR'X - ($PIC_pcrel$0 - 4),%r1
+   :           be,n RR'X - ($PIC_pcrel$0 - 8)(%sr4,%r1)
+
+   Import stub to call shared library routine from normal object file
+   (single sub-space version)
+   :           addil LR'lt_ptr+ltoff,%dp       ; get procedure entry point
+   :           ldw RR'lt_ptr+ltoff(%r1),%r21
+   :            bv %r0(%r21)
+   :           ldw RR'lt_ptr+ltoff+4(%r1),%r19 ; get new dlt value.
+
+   Import stub to call shared library routine from shared library
+   (single sub-space version)
+   :           addil LR'ltoff,%r19             ; get procedure entry point
+   :           ldw RR'ltoff(%r1),%r21
+   :            bv %r0(%r21)
+   :           ldw RR'ltoff+4(%r1),%r19        ; get new dlt value.
+
+   Import stub to call shared library routine from normal object file
+   (multiple sub-space support)
+   :           addil LR'lt_ptr+ltoff,%dp       ; get procedure entry point
+   :           ldw RR'lt_ptr+ltoff(%r1),%r21
+   :           ldw RR'lt_ptr+ltoff+4(%r1),%r19 ; get new dlt value.
+   :           ldsid (%r21),%r1
+   :           mtsp %r1,%sr0
+   :           be 0(%sr0,%r21)                 ; branch to target
+   :           stw %rp,-24(%sp)                ; save rp
+
+   Import stub to call shared library routine from shared library
+   (multiple sub-space support)
+   :           addil LR'ltoff,%r19             ; get procedure entry point
+   :           ldw RR'ltoff(%r1),%r21
+   :           ldw RR'ltoff+4(%r1),%r19        ; get new dlt value.
+   :           ldsid (%r21),%r1
+   :           mtsp %r1,%sr0
+   :           be 0(%sr0,%r21)                 ; branch to target
+   :           stw %rp,-24(%sp)                ; save rp
+
+   Export stub to return from shared lib routine (multiple sub-space support)
+   One of these is created for each exported procedure in a shared
+   library (and stored in the shared lib).  Shared lib routines are
+   called via the first instruction in the export stub so that we can
+   do an inter-space return.  Not required for single sub-space.
+   :           bl,n X,%rp                      ; trap the return
+   :           nop
+   :           ldw -24(%sp),%rp                ; restore the original rp
+   :           ldsid (%rp),%r1
+   :           mtsp %r1,%sr0
+   :           be,n 0(%sr0,%rp)                ; inter-space return  */
+
+#define PLT_ENTRY_SIZE 8
+#define PLABEL_PLT_ENTRY_SIZE PLT_ENTRY_SIZE
+#define GOT_ENTRY_SIZE 4
+#define ELF_DYNAMIC_INTERPRETER "/lib/ld.so.1"
+
+static const bfd_byte plt_stub[] =
 {
-  HPPA_STUB_ILLEGAL,
-  HPPA_STUB_ARG_RELOC,
-  HPPA_STUB_LONG_CALL,
-} hppa_stub_type;
+  0x0e, 0x80, 0x10, 0x96,  /* 1: ldw   0(%r20),%r22            */
+  0xea, 0xc0, 0xc0, 0x00,  /*    bv    %r0(%r22)               */
+  0x0e, 0x88, 0x10, 0x95,  /*    ldw   4(%r20),%r21            */
+#define PLT_STUB_ENTRY (3*4)
+  0xea, 0x9f, 0x1f, 0xdd,  /*    b,l   1b,%r20                 */
+  0xd6, 0x80, 0x1c, 0x1e,  /*    depi  0,31,2,%r20             */
+  0x00, 0xc0, 0xff, 0xee,  /* 9: .word fixup_func              */
+  0xde, 0xad, 0xbe, 0xef   /*    .word fixup_ltp               */
+};
 
-/* This is a list of all the stubs for a particular BFD.  */
+/* Section name for stubs is the associated section name plus this
+   string.  */
+#define STUB_SUFFIX ".stub"
+
+/* Setting the following non-zero makes all long branch stubs
+   generated during a shared link of the PIC variety.  This saves on
+   relocs, but costs one extra instruction per stub.  */
+#ifndef LONG_BRANCH_PIC_IN_SHLIB
+#define LONG_BRANCH_PIC_IN_SHLIB 1
+#endif
+
+/* Set this non-zero to use import stubs instead of long branch stubs
+   where a .plt entry exists for the symbol.  This is a fairly useless
+   option as import stubs are bigger than PIC long branch stubs.  */
+#ifndef LONG_BRANCH_VIA_PLT
+#define LONG_BRANCH_VIA_PLT 0
+#endif
+
+/* We don't need to copy any PC- or GP-relative dynamic relocs into a
+   shared object's dynamic section.  All the relocs of the limited
+   class we are interested in, are absolute.  See check_relocs.  */
+#ifndef IS_ABSOLUTE_RELOC
+#define IS_ABSOLUTE_RELOC(r_type) 1
+#endif
+
+enum elf32_hppa_stub_type {
+  hppa_stub_long_branch,
+  hppa_stub_long_branch_shared,
+  hppa_stub_import,
+  hppa_stub_import_shared,
+  hppa_stub_export,
+  hppa_stub_none
+};
 
-typedef struct elf32_hppa_stub_name_list_struct
-{
-  /* 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?  */
+struct elf32_hppa_stub_hash_entry {
+
+  /* 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, ARG_RELOC_ERR,
-    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},
+
+#if ! LONG_BRANCH_PIC_IN_SHLIB
+  /* It's associated reloc section.  */
+  asection *reloc_sec;
+#endif
+
+  /* Offset within stub_sec of the beginning of this stub.  */
+  bfd_vma stub_offset;
+
+  /* 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.  */
+  bfd_vma target_value;
+  asection *target_section;
+
+  enum elf32_hppa_stub_type stub_type;
+
+  /* The symbol table entry, if any, that this was derived from.  */
+  struct elf32_hppa_link_hash_entry *h;
+
+  /* Where this stub is being called from, or, in the case of combined
+     stub sections, the first input section in the group.  */
+  asection *id_sec;
 };
 
-/* Likewise for the return value.  */
-static CONST arg_reloc_type retval_mismatches[6][6] =
-{
- {NO_ARG_RELOC, NO_ARG_RELOC, NO_ARG_RELOC, ARG_RELOC_ERR,
-    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},
+struct elf32_hppa_link_hash_entry {
+
+  struct elf_link_hash_entry elf;
+
+  /* A pointer to the most recently used stub hash entry against this
+     symbol.  */
+  struct elf32_hppa_stub_hash_entry *stub_cache;
+
+#if ! LONG_BRANCH_PIC_IN_SHLIB
+  /* Used to track whether we have allocated space for a long branch
+     stub relocation for this symbol in the given section.  */
+  asection *stub_reloc_sec;
+#endif
+
+  /* Used to count relocations for delayed sizing of relocation
+     sections.  */
+  struct elf32_hppa_dyn_reloc_entry {
+
+    /* Next relocation in the chain.  */
+    struct elf32_hppa_dyn_reloc_entry *next;
+
+    /* The section in dynobj.  */
+    asection *section;
+
+    /* Number of relocs copied in this section.  */
+    bfd_size_type count;
+  } *reloc_entries;
+
+  /* Set during a static link if we detect a function is PIC.  */
+  unsigned int maybe_pic_call:1;
+
+  /* Set if the only reason we need a .plt entry is for a non-PIC to
+     PIC function call.  */
+  unsigned int pic_call:1;
+
+  /* Set if this symbol is used by a plabel reloc.  */
+  unsigned int plabel:1;
+
+  /* Set if this symbol is an init or fini function and thus should
+     use an absolute reloc.  */
+  unsigned int plt_abs:1;
 };
 
-/* Used for index mapping in symbol-extension sections.  */
-struct elf32_hppa_symextn_map_struct
-{
-  int old_index;
-  bfd *bfd;
-  asymbol *sym;
-  int new_index;
+struct elf32_hppa_link_hash_table {
+
+  /* The main hash table.  */
+  struct elf_link_hash_table root;
+
+  /* The stub hash table.  */
+  struct bfd_hash_table stub_hash_table;
+
+  /* Linker stub bfd.  */
+  bfd *stub_bfd;
+
+  /* Linker call-backs.  */
+  asection * (*add_stub_section) PARAMS ((const char *, asection *));
+  void (*layout_sections_again) PARAMS ((void));
+
+  /* Array to keep track of which stub sections have been created, and
+     information on stub grouping.  */
+  struct map_stub {
+    /* This is the section to which stubs in the group will be
+       attached.  */
+    asection *link_sec;
+    /* The stub section.  */
+    asection *stub_sec;
+#if ! LONG_BRANCH_PIC_IN_SHLIB
+    /* The stub section's reloc section.  */
+    asection *reloc_sec;
+#endif
+  } *stub_group;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *srelgot;
+  asection *splt;
+  asection *srelplt;
+  asection *sdynbss;
+  asection *srelbss;
+
+  /* Used during a final link to store the base of the text and data
+     segments so that we can perform SEGREL relocations.  */
+  bfd_vma text_segment_base;
+  bfd_vma data_segment_base;
+
+  /* Whether we support multiple sub-spaces for shared libs.  */
+  unsigned int multi_subspace:1;
+
+  /* Flags set when PCREL12F and PCREL17F branches detected.  Used to
+     select suitable defaults for the stub group size.  */
+  unsigned int has_12bit_branch:1;
+  unsigned int has_17bit_branch:1;
+
+  /* Set if we need a .plt stub to support lazy dynamic linking.  */
+  unsigned int need_plt_stub:1;
 };
 
-static bfd_reloc_status_type hppa_elf_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+/* Various hash macros and functions.  */
+#define hppa_link_hash_table(p) \
+  ((struct elf32_hppa_link_hash_table *) ((p)->hash))
+
+#define hppa_stub_hash_lookup(table, string, create, copy) \
+  ((struct elf32_hppa_stub_hash_entry *) \
+   bfd_hash_lookup ((table), (string), (create), (copy)))
+
+static struct bfd_hash_entry *stub_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+
+static struct bfd_hash_entry *hppa_link_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+
+static struct bfd_link_hash_table *elf32_hppa_link_hash_table_create
+  PARAMS ((bfd *));
 
-static unsigned long hppa_elf_relocate_insn 
-  PARAMS ((bfd *, asection *, unsigned long, unsigned long, long,
-          long, unsigned long, unsigned long, unsigned long));
+/* Stub handling functions.  */
+static char *hppa_stub_name
+  PARAMS ((const asection *, const asection *,
+          const struct elf32_hppa_link_hash_entry *,
+          const Elf_Internal_Rela *));
 
-static void hppa_elf_relocate_unwind_table
-  PARAMS ((bfd *, PTR, unsigned long, long, long,
-          unsigned long, unsigned long));
+static struct elf32_hppa_stub_hash_entry *hppa_get_stub_entry
+  PARAMS ((const asection *, const asection *,
+          struct elf32_hppa_link_hash_entry *,
+          const Elf_Internal_Rela *,
+          struct elf32_hppa_link_hash_table *));
 
-static long get_symbol_value PARAMS ((asymbol *));
+static struct elf32_hppa_stub_hash_entry *hppa_add_stub
+  PARAMS ((const char *, asection *, struct elf32_hppa_link_hash_table *));
 
-static bfd_reloc_status_type hppa_elf_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd*, char **));
+static enum elf32_hppa_stub_type hppa_type_of_stub
+  PARAMS ((asection *, const Elf_Internal_Rela *,
+          struct elf32_hppa_link_hash_entry *, bfd_vma));
 
-static CONST reloc_howto_type * elf_hppa_reloc_type_lookup
-  PARAMS ((bfd_arch_info_type *, bfd_reloc_code_real_type));
+static boolean hppa_build_one_stub
+  PARAMS ((struct bfd_hash_entry *, PTR));
 
-static symext_entryS elf32_hppa_get_sym_extn PARAMS ((bfd *, asymbol *, int));
+static boolean hppa_size_one_stub
+  PARAMS ((struct bfd_hash_entry *, PTR));
 
-static elf32_hppa_stub_description * find_stubs PARAMS ((bfd *, asection *));
+/* BFD and elf backend functions.  */
+static boolean elf32_hppa_object_p PARAMS ((bfd *));
 
-static elf32_hppa_stub_description * new_stub
-  PARAMS ((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 arg_reloc_type type_of_mismatch PARAMS ((int, int, int));
+static boolean elf32_hppa_create_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
 
-static elf32_hppa_stub_name_list * find_stub_by_name
-  PARAMS ((bfd *, asection *, char *));
+static boolean elf32_hppa_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *,
+          asection *, const Elf_Internal_Rela *));
 
-static elf32_hppa_stub_name_list * add_stub_by_name
-  PARAMS ((bfd *, asection *, asymbol *, struct bfd_link_info *));
+static asection *elf32_hppa_gc_mark_hook
+  PARAMS ((bfd *, struct bfd_link_info *, Elf_Internal_Rela *,
+          struct elf_link_hash_entry *, Elf_Internal_Sym *));
 
-static void hppa_elf_stub_finish PARAMS ((bfd *));
+static boolean elf32_hppa_gc_sweep_hook
+  PARAMS ((bfd *, struct bfd_link_info *,
+          asection *, const Elf_Internal_Rela *));
 
-static void hppa_elf_stub_reloc
-  PARAMS ((elf32_hppa_stub_description *, bfd *, asymbol *, int,
-          elf32_hppa_reloc_type));
+static void elf32_hppa_hide_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 
-static int hppa_elf_arg_reloc_needed_p
-  PARAMS ((bfd *, arelent *, arg_reloc_type [5], symext_entryS));
+static boolean elf32_hppa_adjust_dynamic_symbol
+  PARAMS ((struct bfd_link_info *, 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 hppa_handle_PIC_calls
+  PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static void hppa_elf_create_stub_sec 
-  PARAMS ((bfd *, bfd *, asection **, struct bfd_link_info *));
+static boolean allocate_plt_and_got_and_discard_relocs
+  PARAMS ((struct elf_link_hash_entry *, PTR));
 
-static int hppa_elf_long_branch_needed_p
-  PARAMS ((bfd *, asection *, arelent *, asymbol *, unsigned));
+static boolean clobber_millicode_symbols
+  PARAMS ((struct elf_link_hash_entry *, struct bfd_link_info *));
 
-static boolean hppa_elf_set_section_contents
-  PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
+static boolean elf32_hppa_size_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
 
-static void elf_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
+static boolean elf32_hppa_final_link
+  PARAMS ((bfd *, struct bfd_link_info *));
 
-static void elf32_hppa_backend_symbol_processing PARAMS ((bfd *, asymbol *));
+static void hppa_record_segment_addr
+  PARAMS ((bfd *, asection *, PTR));
 
-static boolean elf32_hppa_backend_section_processing
-  PARAMS ((bfd *, Elf32_Internal_Shdr *));
+static bfd_reloc_status_type final_link_relocate
+  PARAMS ((asection *, bfd_byte *, const Elf_Internal_Rela *,
+          bfd_vma, struct elf32_hppa_link_hash_table *, asection *,
+          struct elf32_hppa_link_hash_entry *));
 
-static boolean elf32_hppa_backend_symbol_table_processing
-  PARAMS ((bfd *, elf_symbol_type *, int));
+static boolean elf32_hppa_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
+          bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
 
-static boolean elf32_hppa_backend_section_from_shdr
-  PARAMS ((bfd *, Elf32_Internal_Shdr *, char *));
+static int hppa_unwind_entry_compare
+  PARAMS ((const PTR, const PTR));
 
-static boolean elf32_hppa_backend_fake_sections
-  PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
+static boolean elf32_hppa_finish_dynamic_symbol
+  PARAMS ((bfd *, struct bfd_link_info *,
+          struct elf_link_hash_entry *, Elf_Internal_Sym *));
 
-static boolean elf32_hppa_backend_section_from_bfd_section
-  PARAMS ((bfd *, Elf32_Internal_Shdr *, asection *, int *));
+static boolean elf32_hppa_finish_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
 
-/* ELF/PA relocation howto entries.  */
+static void elf32_hppa_post_process_headers
+  PARAMS ((bfd *, struct bfd_link_info *));
 
-static reloc_howto_type elf_hppa_howto_table[ELF_HOWTO_TABLE_SIZE] =
+static int elf32_hppa_elf_get_symbol_type
+  PARAMS ((Elf_Internal_Sym *, int));
+
+/* Assorted hash table functions.  */
+
+/* Initialize an entry in the stub hash table.  */
+
+static struct bfd_hash_entry *
+stub_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
 {
-  {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"},
-};
+  struct elf32_hppa_stub_hash_entry *ret;
 
-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)
-     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;
+  ret = (struct elf32_hppa_stub_hash_entry *) entry;
+
+  /* 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;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elf32_hppa_stub_hash_entry *)
+        bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
+
+  if (ret)
+    {
+      /* Initialize the local fields.  */
+      ret->stub_sec = NULL;
+#if ! LONG_BRANCH_PIC_IN_SHLIB
+      ret->reloc_sec = NULL;
+#endif
+      ret->stub_offset = 0;
+      ret->target_value = 0;
+      ret->target_section = NULL;
+      ret->stub_type = hppa_stub_long_branch;
+      ret->h = NULL;
+      ret->id_sec = NULL;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Initialize an entry in the link hash table.  */
+
+static struct bfd_hash_entry *
+hppa_link_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
 {
-  unsigned char opcode = get_opcode (insn);
-  long constant_value;
-  unsigned arg_reloc;
-
-  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);
+  struct elf32_hppa_link_hash_entry *ret;
 
-      return hppa_rebuild_insn (abfd, insn, sym_value >> 2, r_format);
+  ret = (struct elf32_hppa_link_hash_entry *) entry;
 
-    default:
-      if (opcode == 0)
-       {
-         constant_value = HPPA_R_CONSTANT (r_addend);
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    {
+      ret = ((struct elf32_hppa_link_hash_entry *)
+            bfd_hash_allocate (table,
+                               sizeof (struct elf32_hppa_link_hash_entry)));
+      if (ret == NULL)
+       return NULL;
+    }
 
-         if (pcrel)
-           sym_value -= address;
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elf32_hppa_link_hash_entry *)
+        _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+                                    table, string));
 
-         return hppa_field_adjust (sym_value, constant_value, r_field);
-       }
-      else
-       abort ();
+  if (ret)
+    {
+      /* Initialize the local fields.  */
+#if ! LONG_BRANCH_PIC_IN_SHLIB
+      ret->stub_reloc_sec = NULL;
+#endif
+      ret->stub_cache = NULL;
+      ret->reloc_entries = NULL;
+      ret->maybe_pic_call = 0;
+      ret->pic_call = 0;
+      ret->plabel = 0;
+      ret->plt_abs = 0;
     }
+
+  return (struct bfd_hash_entry *) ret;
 }
 
-/* Relocate a single unwind entry, or an entire table of them.  */
+/* 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 void
-hppa_elf_relocate_unwind_table (abfd, data, address, sym_value,
-                               r_addend, r_type, r_field)
+static struct bfd_link_hash_table *
+elf32_hppa_link_hash_table_create (abfd)
      bfd *abfd;
-     PTR data;
-     unsigned long address;
-     long sym_value;
-     long r_addend;
-     unsigned long r_type;
-     unsigned long r_field;
 {
-  bfd_byte *hit_data = address + (bfd_byte *) data;
-  long start_offset;
-  long end_offset;
-  long relocated_value;
-  int i;
+  struct elf32_hppa_link_hash_table *ret;
+  bfd_size_type amt = sizeof (*ret);
 
-  switch (r_type)
+  ret = (struct elf32_hppa_link_hash_table *) bfd_alloc (abfd, amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd, hppa_link_hash_newfunc))
     {
-    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;
+      bfd_release (abfd, ret);
+      return NULL;
+    }
 
-    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;
+  /* Init the stub hash table too.  */
+  if (!bfd_hash_table_init (&ret->stub_hash_table, stub_hash_newfunc))
+    return NULL;
+
+  ret->stub_bfd = NULL;
+  ret->add_stub_section = NULL;
+  ret->layout_sections_again = NULL;
+  ret->stub_group = NULL;
+  ret->sgot = NULL;
+  ret->srelgot = NULL;
+  ret->splt = NULL;
+  ret->srelplt = NULL;
+  ret->sdynbss = NULL;
+  ret->srelbss = NULL;
+  ret->text_segment_base = (bfd_vma) -1;
+  ret->data_segment_base = (bfd_vma) -1;
+  ret->multi_subspace = 0;
+  ret->has_12bit_branch = 0;
+  ret->has_17bit_branch = 0;
+  ret->need_plt_stub = 0;
+
+  return &ret->root.root;
+}
 
-    default:
-      abort ();
+/* Build a name for an entry in the stub hash table.  */
+
+static char *
+hppa_stub_name (input_section, sym_sec, hash, rel)
+     const asection *input_section;
+     const asection *sym_sec;
+     const struct elf32_hppa_link_hash_entry *hash;
+     const Elf_Internal_Rela *rel;
+{
+  char *stub_name;
+  bfd_size_type len;
+
+  if (hash)
+    {
+      len = 8 + 1 + strlen (hash->elf.root.root.string) + 1 + 8 + 1;
+      stub_name = bfd_malloc (len);
+      if (stub_name != NULL)
+       {
+         sprintf (stub_name, "%08x_%s+%x",
+                  input_section->id & 0xffffffff,
+                  hash->elf.root.root.string,
+                  (int) rel->r_addend & 0xffffffff);
+       }
+    }
+  else
+    {
+      len = 8 + 1 + 8 + 1 + 8 + 1 + 8 + 1;
+      stub_name = bfd_malloc (len);
+      if (stub_name != NULL)
+       {
+         sprintf (stub_name, "%08x_%x:%x+%x",
+                  input_section->id & 0xffffffff,
+                  sym_sec->id & 0xffffffff,
+                  (int) ELF32_R_SYM (rel->r_info) & 0xffffffff,
+                  (int) rel->r_addend & 0xffffffff);
+       }
     }
+  return stub_name;
 }
 
-/* Return the relocated value of the given symbol.  */
+/* Look up an entry in the stub hash.  Stub entries are cached because
+   creating the stub name takes a bit of time.  */
 
-static long
-get_symbol_value (symbol)
-     asymbol *symbol;
+static struct elf32_hppa_stub_hash_entry *
+hppa_get_stub_entry (input_section, sym_sec, hash, rel, hplink)
+     const asection *input_section;
+     const asection *sym_sec;
+     struct elf32_hppa_link_hash_entry *hash;
+     const Elf_Internal_Rela *rel;
+     struct elf32_hppa_link_hash_table *hplink;
 {
-  if (symbol == NULL
-      || symbol->section == &bfd_com_section)
-    return 0;
+  struct elf32_hppa_stub_hash_entry *stub_entry;
+  const asection *id_sec;
+
+  /* If this input section is part of a group of sections sharing one
+     stub section, then use the id of the first section in the group.
+     Stub names need to include a section id, as there may well be
+     more than one stub used to reach say, printf, and we need to
+     distinguish between them.  */
+  id_sec = hplink->stub_group[input_section->id].link_sec;
+
+  if (hash != NULL && hash->stub_cache != NULL
+      && hash->stub_cache->h == hash
+      && hash->stub_cache->id_sec == id_sec)
+    {
+      stub_entry = hash->stub_cache;
+    }
   else
-    return symbol->value + symbol->section->output_section->vma
-      + symbol->section->output_offset;
+    {
+      char *stub_name;
+
+      stub_name = hppa_stub_name (id_sec, sym_sec, hash, rel);
+      if (stub_name == NULL)
+       return NULL;
+
+      stub_entry = hppa_stub_hash_lookup (&hplink->stub_hash_table,
+                                         stub_name, false, false);
+      if (stub_entry == NULL)
+       {
+         if (hash == NULL || hash->elf.root.type != bfd_link_hash_undefweak)
+           (*_bfd_error_handler) (_("%s(%s+0x%lx): cannot find stub entry %s"),
+                                  bfd_get_filename (input_section->owner),
+                                  input_section->name,
+                                  (long) rel->r_offset,
+                                  stub_name);
+       }
+      else
+       {
+         if (hash != NULL)
+           hash->stub_cache = stub_entry;
+       }
+
+      free (stub_name);
+    }
+
+  return stub_entry;
 }
 
-/* Return one (or more) BFD relocations which implement the base
-   relocation with modifications based on format and field.  */
+/* Add a new stub entry to the stub hash.  Not all fields of the new
+   stub entry are initialised.  */
 
-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 struct elf32_hppa_stub_hash_entry *
+hppa_add_stub (stub_name, section, hplink)
+     const char *stub_name;
+     asection *section;
+     struct elf32_hppa_link_hash_table *hplink;
 {
-  elf32_hppa_reloc_type *finaltype;
-  elf32_hppa_reloc_type **final_types;
+  asection *link_sec;
+  asection *stub_sec;
+  struct elf32_hppa_stub_hash_entry *stub_entry;
+
+  link_sec = hplink->stub_group[section->id].link_sec;
+  stub_sec = hplink->stub_group[section->id].stub_sec;
+  if (stub_sec == NULL)
+    {
+      stub_sec = hplink->stub_group[link_sec->id].stub_sec;
+      if (stub_sec == NULL)
+       {
+         bfd_size_type len;
+         char *s_name;
+
+         len = strlen (link_sec->name) + sizeof (STUB_SUFFIX);
+         s_name = bfd_alloc (hplink->stub_bfd, len);
+         if (s_name == NULL)
+           return NULL;
+
+         strcpy (s_name, link_sec->name);
+         strcpy (s_name + len - sizeof (STUB_SUFFIX), STUB_SUFFIX);
+         stub_sec = (*hplink->add_stub_section) (s_name, link_sec);
+         if (stub_sec == NULL)
+           return NULL;
+         hplink->stub_group[link_sec->id].stub_sec = stub_sec;
+       }
+      hplink->stub_group[section->id].stub_sec = stub_sec;
+    }
+
+  /* Enter this entry into the linker stub hash table.  */
+  stub_entry = hppa_stub_hash_lookup (&hplink->stub_hash_table, stub_name,
+                                     true, false);
+  if (stub_entry == NULL)
+    {
+      (*_bfd_error_handler) (_("%s: cannot create stub entry %s"),
+                            bfd_get_filename (section->owner),
+                            stub_name);
+      return NULL;
+    }
+
+  stub_entry->stub_sec = stub_sec;
+#if ! LONG_BRANCH_PIC_IN_SHLIB
+  stub_entry->reloc_sec = hplink->stub_group[section->id].reloc_sec;
+#endif
+  stub_entry->stub_offset = 0;
+  stub_entry->id_sec = link_sec;
+  return stub_entry;
+}
 
-  /* 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 */
+/* Determine the type of stub needed, if any, for a call.  */
 
-  /* 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 */
+static enum elf32_hppa_stub_type
+hppa_type_of_stub (input_sec, rel, hash, destination)
+     asection *input_sec;
+     const Elf_Internal_Rela *rel;
+     struct elf32_hppa_link_hash_entry *hash;
+     bfd_vma destination;
+{
+  bfd_vma location;
+  bfd_vma branch_offset;
+  bfd_vma max_branch_offset;
+  unsigned int r_type;
+
+  if (hash != NULL
+      && (((hash->elf.root.type == bfd_link_hash_defined
+           || hash->elf.root.type == bfd_link_hash_defweak)
+          && hash->elf.root.u.def.section->output_section == NULL)
+         || (hash->elf.root.type == bfd_link_hash_defweak
+             && hash->elf.dynindx != -1
+             && hash->elf.plt.offset != (bfd_vma) -1)
+         || hash->elf.root.type == bfd_link_hash_undefweak
+         || hash->elf.root.type == bfd_link_hash_undefined
+         || (hash->maybe_pic_call && !(input_sec->flags & SEC_HAS_GOT_REF))))
+    {
+      /* If output_section is NULL, then it's a symbol defined in a
+        shared library.  We will need an import stub.  Decide between
+        hppa_stub_import and hppa_stub_import_shared later.  For
+        shared links we need stubs for undefined or weak syms too;
+        They will presumably be resolved by the dynamic linker.  */
+      return hppa_stub_import;
+    }
 
-  /* Some reasonable defaults.  */
-  final_types[0] = finaltype;
-  final_types[1] = NULL;
+  /* Determine where the call point is.  */
+  location = (input_sec->output_offset
+             + input_sec->output_section->vma
+             + rel->r_offset);
 
-#define final_type finaltype[0]
+  branch_offset = destination - location - 8;
+  r_type = ELF32_R_TYPE (rel->r_info);
 
-  final_type = base_type;
+  /* 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 and counts in units of 4 bytes.  */
+  if (r_type == (unsigned int) R_PARISC_PCREL17F)
+    {
+      max_branch_offset = (1 << (17-1)) << 2;
+    }
+  else if (r_type == (unsigned int) R_PARISC_PCREL12F)
+    {
+      max_branch_offset = (1 << (12-1)) << 2;
+    }
+  else /* R_PARISC_PCREL22F.  */
+    {
+      max_branch_offset = (1 << (22-1)) << 2;
+    }
 
-  /* 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)
+  if (branch_offset + max_branch_offset >= 2*max_branch_offset)
     {
-    case R_HPPA:
-      switch (format)
+#if LONG_BRANCH_VIA_PLT
+      if (hash != NULL
+         && hash->elf.dynindx != -1
+         && hash->elf.plt.offset != (bfd_vma) -1
+         && hash->elf.type != STT_PARISC_MILLI)
        {
-       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;
+         /* If we are doing a shared link and find we need a long
+            branch stub, then go via the .plt if possible.  */
+         return hppa_stub_import;
+       }
+      else
+#endif
+       return hppa_stub_long_branch;
+    }
+  return hppa_stub_none;
+}
 
-       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;
+/* Build one linker stub as defined by the stub hash table entry GEN_ENTRY.
+   IN_ARG contains the link info pointer.  */
 
-       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;
+#define LDIL_R1                0x20200000      /* ldil  LR'XXX,%r1             */
+#define BE_SR4_R1      0xe0202002      /* be,n  RR'XXX(%sr4,%r1)       */
+
+#define BL_R1          0xe8200000      /* b,l   .+8,%r1                */
+#define ADDIL_R1       0x28200000      /* addil LR'XXX,%r1,%r1         */
+#define DEPI_R1                0xd4201c1e      /* depi  0,31,2,%r1             */
+
+#define ADDIL_DP       0x2b600000      /* addil LR'XXX,%dp,%r1         */
+#define LDW_R1_R21     0x48350000      /* ldw   RR'XXX(%sr0,%r1),%r21  */
+#define BV_R0_R21      0xeaa0c000      /* bv    %r0(%r21)              */
+#define LDW_R1_R19     0x48330000      /* ldw   RR'XXX(%sr0,%r1),%r19  */
+
+#define ADDIL_R19      0x2a600000      /* addil LR'XXX,%r19,%r1        */
+#define LDW_R1_DP      0x483b0000      /* ldw   RR'XXX(%sr0,%r1),%dp   */
+
+#define LDSID_R21_R1   0x02a010a1      /* ldsid (%sr0,%r21),%r1        */
+#define MTSP_R1                0x00011820      /* mtsp  %r1,%sr0               */
+#define BE_SR0_R21     0xe2a00000      /* be    0(%sr0,%r21)           */
+#define STW_RP         0x6bc23fd1      /* stw   %rp,-24(%sr0,%sp)      */
+
+#define BL_RP          0xe8400002      /* b,l,n XXX,%rp                */
+#define NOP            0x08000240      /* nop                          */
+#define LDW_RP         0x4bc23fd1      /* ldw   -24(%sr0,%sp),%rp      */
+#define LDSID_RP_R1    0x004010a1      /* ldsid (%sr0,%rp),%r1         */
+#define BE_SR0_RP      0xe0400002      /* be,n  0(%sr0,%rp)            */
+
+#ifndef R19_STUBS
+#define R19_STUBS 1
+#endif
+
+#if R19_STUBS
+#define LDW_R1_DLT     LDW_R1_R19
+#else
+#define LDW_R1_DLT     LDW_R1_DP
+#endif
+
+static boolean
+hppa_build_one_stub (gen_entry, in_arg)
+     struct bfd_hash_entry *gen_entry;
+     PTR in_arg;
+{
+  struct elf32_hppa_stub_hash_entry *stub_entry;
+  struct bfd_link_info *info;
+  struct elf32_hppa_link_hash_table *hplink;
+  asection *stub_sec;
+  bfd *stub_bfd;
+  bfd_byte *loc;
+  bfd_vma sym_value;
+  bfd_vma insn;
+  bfd_vma off;
+  int val;
+  int size;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_hppa_stub_hash_entry *) gen_entry;
+  info = (struct bfd_link_info *) in_arg;
+
+  hplink = hppa_link_hash_table (info);
+  stub_sec = stub_entry->stub_sec;
 
-       case 21:
-         switch (field)
+  /* Make a note of the offset within the stubs for this entry.  */
+  stub_entry->stub_offset = stub_sec->_raw_size;
+  loc = stub_sec->contents + stub_entry->stub_offset;
+
+  stub_bfd = stub_sec->owner;
+
+  switch (stub_entry->stub_type)
+    {
+    case hppa_stub_long_branch:
+      /* 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.  */
+      sym_value = (stub_entry->target_value
+                  + stub_entry->target_section->output_offset
+                  + stub_entry->target_section->output_section->vma);
+
+      val = hppa_field_adjust (sym_value, (bfd_signed_vma) 0, e_lrsel);
+      insn = hppa_rebuild_insn ((int) LDIL_R1, val, 21);
+      bfd_put_32 (stub_bfd, insn, loc);
+
+      val = hppa_field_adjust (sym_value, (bfd_signed_vma) 0, e_rrsel) >> 2;
+      insn = hppa_rebuild_insn ((int) BE_SR4_R1, val, 17);
+      bfd_put_32 (stub_bfd, insn, loc + 4);
+
+#if ! LONG_BRANCH_PIC_IN_SHLIB
+      if (info->shared)
+       {
+         /* Output a dynamic relocation for this stub.  We only
+            output one PCREL21L reloc per stub, trusting that the
+            dynamic linker will also fix the implied PCREL17R for the
+            second instruction.  PCREL21L dynamic relocs had better
+            never be emitted for some other purpose...  */
+         asection *srel;
+         Elf_Internal_Rela outrel;
+
+         if (stub_entry->h == NULL)
            {
-           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;
+             (*_bfd_error_handler)
+               (_("%s(%s+0x%lx): cannot relocate %s, recompile with -ffunction-sections"),
+                bfd_get_filename (stub_entry->target_section->owner),
+                stub_sec->name,
+                (long) stub_entry->stub_offset,
+                stub_entry->root.string);
+             bfd_set_error (bfd_error_bad_value);
+             return false;
            }
-         break;
 
-       case 32:
-         switch (field)
+         srel = stub_entry->reloc_sec;
+         if (srel == NULL)
            {
-           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;
+             (*_bfd_error_handler)
+               (_("Could not find relocation section for %s"),
+                stub_sec->name);
+             bfd_set_error (bfd_error_bad_value);
+             return false;
            }
-         break;
 
-       default:
-         abort ();
-         break;
+         outrel.r_offset = (stub_entry->stub_offset
+                            + stub_sec->output_offset
+                            + stub_sec->output_section->vma);
+         outrel.r_info = ELF32_R_INFO (0, R_PARISC_PCREL21L);
+         outrel.r_addend = sym_value;
+         bfd_elf32_swap_reloca_out (stub_sec->output_section->owner,
+                                    &outrel,
+                                    ((Elf32_External_Rela *)
+                                     srel->contents + srel->reloc_count));
+         ++srel->reloc_count;
        }
+#endif
+      size = 8;
       break;
 
+    case hppa_stub_long_branch_shared:
+      /* Branches are relative.  This is where we are going to.  */
+      sym_value = (stub_entry->target_value
+                  + stub_entry->target_section->output_offset
+                  + stub_entry->target_section->output_section->vma);
+
+      /* And this is where we are coming from, more or less.  */
+      sym_value -= (stub_entry->stub_offset
+                   + stub_sec->output_offset
+                   + stub_sec->output_section->vma);
+
+      bfd_put_32 (stub_bfd, (bfd_vma) BL_R1, loc);
+      val = hppa_field_adjust (sym_value, (bfd_signed_vma) -8, e_lrsel);
+      insn = hppa_rebuild_insn ((int) ADDIL_R1, val, 21);
+      bfd_put_32 (stub_bfd, insn, loc + 4);
+
+      val = hppa_field_adjust (sym_value, (bfd_signed_vma) -8, e_rrsel) >> 2;
+      insn = hppa_rebuild_insn ((int) BE_SR4_R1, val, 17);
+      bfd_put_32 (stub_bfd, insn, loc + 8);
+      size = 12;
+      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 hppa_stub_import:
+    case hppa_stub_import_shared:
+      off = stub_entry->h->elf.plt.offset;
+      if (off >= (bfd_vma) -2)
+       abort ();
 
-       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;
+      off &= ~ (bfd_vma) 1;
+      sym_value = (off
+                  + hplink->splt->output_offset
+                  + hplink->splt->output_section->vma
+                  - elf_gp (hplink->splt->output_section->owner));
+
+      insn = ADDIL_DP;
+#if R19_STUBS
+      if (stub_entry->stub_type == hppa_stub_import_shared)
+       insn = ADDIL_R19;
+#endif
+      val = hppa_field_adjust (sym_value, (bfd_signed_vma) 0, e_lrsel),
+      insn = hppa_rebuild_insn ((int) insn, val, 21);
+      bfd_put_32 (stub_bfd, insn, loc);
+
+      /* It is critical to use lrsel/rrsel here because we are using
+        two different offsets (+0 and +4) from sym_value.  If we use
+        lsel/rsel then with unfortunate sym_values we will round
+        sym_value+4 up to the next 2k block leading to a mis-match
+        between the lsel and rsel value.  */
+      val = hppa_field_adjust (sym_value, (bfd_signed_vma) 0, e_rrsel);
+      insn = hppa_rebuild_insn ((int) LDW_R1_R21, val, 14);
+      bfd_put_32 (stub_bfd, insn, loc + 4);
+
+      if (hplink->multi_subspace)
+       {
+         val = hppa_field_adjust (sym_value, (bfd_signed_vma) 4, e_rrsel);
+         insn = hppa_rebuild_insn ((int) LDW_R1_DLT, val, 14);
+         bfd_put_32 (stub_bfd, insn, loc + 8);
 
-       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;
+         bfd_put_32 (stub_bfd, (bfd_vma) LDSID_R21_R1, loc + 12);
+         bfd_put_32 (stub_bfd, (bfd_vma) MTSP_R1,      loc + 16);
+         bfd_put_32 (stub_bfd, (bfd_vma) BE_SR0_R21,   loc + 20);
+         bfd_put_32 (stub_bfd, (bfd_vma) STW_RP,       loc + 24);
 
-       default:
-         abort ();
-         break;
+         size = 28;
        }
-      break;
+      else
+       {
+         bfd_put_32 (stub_bfd, (bfd_vma) BV_R0_R21, loc + 8);
+         val = hppa_field_adjust (sym_value, (bfd_signed_vma) 4, e_rrsel);
+         insn = hppa_rebuild_insn ((int) LDW_R1_DLT, val, 14);
+         bfd_put_32 (stub_bfd, insn, loc + 12);
 
+         size = 16;
+       }
 
-    case R_HPPA_PCREL_CALL:
-      switch (format)
+      if (!info->shared
+         && stub_entry->h != NULL
+         && stub_entry->h->pic_call)
        {
-       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;
+         /* Build the .plt entry needed to call a PIC function from
+            statically linked code.  We don't need any relocs.  */
+         bfd *dynobj;
+         struct elf32_hppa_link_hash_entry *eh;
+         bfd_vma value;
 
-       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;
+         dynobj = hplink->root.dynobj;
+         eh = (struct elf32_hppa_link_hash_entry *) stub_entry->h;
 
-       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;
+         if (eh->elf.root.type != bfd_link_hash_defined
+             && eh->elf.root.type != bfd_link_hash_defweak)
+           abort ();
 
-       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;
+         value = (eh->elf.root.u.def.value
+                  + eh->elf.root.u.def.section->output_offset
+                  + eh->elf.root.u.def.section->output_section->vma);
 
-       default:
-         abort ();
-         break;
+         /* Fill in the entry in the procedure linkage table.
+
+            The format of a plt entry is
+            <funcaddr>
+            <__gp>.  */
+
+         bfd_put_32 (hplink->splt->owner, value,
+                     hplink->splt->contents + off);
+         value = elf_gp (hplink->splt->output_section->owner);
+         bfd_put_32 (hplink->splt->owner, value,
+                     hplink->splt->contents + off + 4);
        }
       break;
 
+    case hppa_stub_export:
+      /* Branches are relative.  This is where we are going to.  */
+      sym_value = (stub_entry->target_value
+                  + stub_entry->target_section->output_offset
+                  + stub_entry->target_section->output_section->vma);
 
-    case R_HPPA_PLABEL:
-      switch (format)
+      /* And this is where we are coming from.  */
+      sym_value -= (stub_entry->stub_offset
+                   + stub_sec->output_offset
+                   + stub_sec->output_section->vma);
+
+      if (sym_value - 8 + 0x40000 >= 0x80000)
        {
-       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;
-           }
+         (*_bfd_error_handler)
+           (_("%s(%s+0x%lx): cannot reach %s, recompile with -ffunction-sections"),
+            bfd_get_filename (stub_entry->target_section->owner),
+            stub_sec->name,
+            (long) stub_entry->stub_offset,
+            stub_entry->root.string);
+         bfd_set_error (bfd_error_bad_value);
+         return false;
+       }
+
+      val = hppa_field_adjust (sym_value, (bfd_signed_vma) -8, e_fsel) >> 2;
+      insn = hppa_rebuild_insn ((int) BL_RP, val, 17);
+      bfd_put_32 (stub_bfd, insn, loc);
+
+      bfd_put_32 (stub_bfd, (bfd_vma) NOP,         loc + 4);
+      bfd_put_32 (stub_bfd, (bfd_vma) LDW_RP,      loc + 8);
+      bfd_put_32 (stub_bfd, (bfd_vma) LDSID_RP_R1, loc + 12);
+      bfd_put_32 (stub_bfd, (bfd_vma) MTSP_R1,     loc + 16);
+      bfd_put_32 (stub_bfd, (bfd_vma) BE_SR0_RP,   loc + 20);
+
+      /* Point the function symbol at the stub.  */
+      stub_entry->h->elf.root.u.def.section = stub_sec;
+      stub_entry->h->elf.root.u.def.value = stub_sec->_raw_size;
+
+      size = 24;
+      break;
+
+    default:
+      BFD_FAIL ();
+      return false;
+    }
+
+  stub_sec->_raw_size += size;
+  return true;
+}
+
+#undef LDIL_R1
+#undef BE_SR4_R1
+#undef BL_R1
+#undef ADDIL_R1
+#undef DEPI_R1
+#undef ADDIL_DP
+#undef LDW_R1_R21
+#undef LDW_R1_DLT
+#undef LDW_R1_R19
+#undef ADDIL_R19
+#undef LDW_R1_DP
+#undef LDSID_R21_R1
+#undef MTSP_R1
+#undef BE_SR0_R21
+#undef STW_RP
+#undef BV_R0_R21
+#undef BL_RP
+#undef NOP
+#undef LDW_RP
+#undef LDSID_RP_R1
+#undef BE_SR0_RP
+
+/* As above, but don't actually build the stub.  Just bump offset so
+   we know stub section sizes.  */
+
+static boolean
+hppa_size_one_stub (gen_entry, in_arg)
+     struct bfd_hash_entry *gen_entry;
+     PTR in_arg;
+{
+  struct elf32_hppa_stub_hash_entry *stub_entry;
+  struct elf32_hppa_link_hash_table *hplink;
+  int size;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_hppa_stub_hash_entry *) gen_entry;
+  hplink = (struct elf32_hppa_link_hash_table *) in_arg;
+
+  if (stub_entry->stub_type == hppa_stub_long_branch)
+    {
+#if ! LONG_BRANCH_PIC_IN_SHLIB
+      if (stub_entry->reloc_sec != NULL)
+       stub_entry->reloc_sec->_raw_size += sizeof (Elf32_External_Rela);
+#endif
+      size = 8;
+    }
+  else if (stub_entry->stub_type == hppa_stub_long_branch_shared)
+    size = 12;
+  else if (stub_entry->stub_type == hppa_stub_export)
+    size = 24;
+  else /* hppa_stub_import or hppa_stub_import_shared.  */
+    {
+      if (hplink->multi_subspace)
+       size = 28;
+      else
+       size = 16;
+    }
+
+  stub_entry->stub_sec->_raw_size += size;
+  return true;
+}
+
+/* Return nonzero if ABFD represents an HPPA ELF32 file.
+   Additionally we set the default architecture and machine.  */
+
+static boolean
+elf32_hppa_object_p (abfd)
+     bfd *abfd;
+{
+  Elf_Internal_Ehdr * i_ehdrp;
+  unsigned int flags;
+
+  i_ehdrp = elf_elfheader (abfd);
+  if (strcmp (bfd_get_target (abfd), "elf32-hppa-linux") == 0)
+    {
+      if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_LINUX)
+       return false;
+    }
+  else
+    {
+      if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_HPUX)
+       return false;
+    }
+
+  flags = i_ehdrp->e_flags;
+  switch (flags & (EF_PARISC_ARCH | EF_PARISC_WIDE))
+    {
+    case EFA_PARISC_1_0:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 10);
+    case EFA_PARISC_1_1:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 11);
+    case EFA_PARISC_2_0:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 20);
+    case EFA_PARISC_2_0 | EF_PARISC_WIDE:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 25);
+    }
+  return true;
+}
+
+/* Undo the generic ELF code's subtraction of section->vma from the
+   value of each external symbol.  */
+
+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;
+{
+  *valp += (*secp)->vma;
+  return true;
+}
+
+/* Create the .plt and .got sections, and set up our hash table
+   short-cuts to various dynamic sections.  */
+
+static boolean
+elf32_hppa_create_dynamic_sections (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  struct elf32_hppa_link_hash_table *hplink;
+
+  /* Don't try to create the .plt and .got twice.  */
+  hplink = hppa_link_hash_table (info);
+  if (hplink->splt != NULL)
+    return true;
+
+  /* Call the generic code to do most of the work.  */
+  if (! _bfd_elf_create_dynamic_sections (abfd, info))
+    return false;
+
+  hplink->splt = bfd_get_section_by_name (abfd, ".plt");
+  hplink->srelplt = bfd_get_section_by_name (abfd, ".rela.plt");
+
+  hplink->sgot = bfd_get_section_by_name (abfd, ".got");
+  hplink->srelgot = bfd_make_section (abfd, ".rela.got");
+  if (hplink->srelgot == NULL
+      || ! bfd_set_section_flags (abfd, hplink->srelgot,
+                                 (SEC_ALLOC
+                                  | SEC_LOAD
+                                  | SEC_HAS_CONTENTS
+                                  | SEC_IN_MEMORY
+                                  | SEC_LINKER_CREATED
+                                  | SEC_READONLY))
+      || ! bfd_set_section_alignment (abfd, hplink->srelgot, 2))
+    return false;
+
+  hplink->sdynbss = bfd_get_section_by_name (abfd, ".dynbss");
+  hplink->srelbss = bfd_get_section_by_name (abfd, ".rela.bss");
+
+  return true;
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  At this point we haven't necessarily read all the input
+   files.  */
+
+static boolean
+elf32_hppa_check_relocs (abfd, info, sec, relocs)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
+{
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  struct elf32_hppa_link_hash_table *hplink;
+  asection *sreloc;
+  asection *stubreloc;
+
+  if (info->relocateable)
+    return true;
+
+  hplink = hppa_link_hash_table (info);
+  dynobj = hplink->root.dynobj;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+  sreloc = NULL;
+  stubreloc = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      enum {
+       NEED_GOT = 1,
+       NEED_PLT = 2,
+       NEED_DYNREL = 4,
+#if LONG_BRANCH_PIC_IN_SHLIB
+       NEED_STUBREL = 0,  /* We won't be needing them in this case.  */
+#else
+       NEED_STUBREL = 8,
+#endif
+       PLT_PLABEL = 16
+      };
+
+      unsigned int r_symndx, r_type;
+      struct elf32_hppa_link_hash_entry *h;
+      int need_entry;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      if (r_symndx < symtab_hdr->sh_info)
+       h = NULL;
+      else
+       h = ((struct elf32_hppa_link_hash_entry *)
+            sym_hashes[r_symndx - symtab_hdr->sh_info]);
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      switch (r_type)
+       {
+       case R_PARISC_DLTIND14F:
+       case R_PARISC_DLTIND14R:
+       case R_PARISC_DLTIND21L:
+         /* This symbol requires a global offset table entry.  */
+         need_entry = NEED_GOT;
+
+         /* Mark this section as containing PIC code.  */
+         sec->flags |= SEC_HAS_GOT_REF;
          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;
-           }
+       case R_PARISC_PLABEL14R: /* "Official" procedure labels.  */
+       case R_PARISC_PLABEL21L:
+       case R_PARISC_PLABEL32:
+         /* If the addend is non-zero, we break badly.  */
+         if (rel->r_addend != 0)
+           abort ();
+
+         /* If we are creating a shared library, then we need to
+            create a PLT entry for all PLABELs, because PLABELs with
+            local symbols may be passed via a pointer to another
+            object.  Additionally, output a dynamic relocation
+            pointing to the PLT entry.
+            For executables, the original 32-bit ABI allowed two
+            different styles of PLABELs (function pointers):  For
+            global functions, the PLABEL word points into the .plt
+            two bytes past a (function address, gp) pair, and for
+            local functions the PLABEL points directly at the
+            function.  The magic +2 for the first type allows us to
+            differentiate between the two.  As you can imagine, this
+            is a real pain when it comes to generating code to call
+            functions indirectly or to compare function pointers.
+            We avoid the mess by always pointing a PLABEL into the
+            .plt, even for local functions.  */
+         need_entry = PLT_PLABEL | NEED_PLT | NEED_DYNREL;
          break;
 
-       case 21:
-         switch (field)
+       case R_PARISC_PCREL12F:
+         hplink->has_12bit_branch = 1;
+         /* Fall thru.  */
+       case R_PARISC_PCREL17C:
+       case R_PARISC_PCREL17F:
+         hplink->has_17bit_branch = 1;
+         /* Fall thru.  */
+       case R_PARISC_PCREL22F:
+         /* Function calls might need to go through the .plt, and
+            might require long branch stubs.  */
+         if (h == NULL)
            {
-           case e_lsel:
-             final_type = R_HPPA_PLABEL_L21;
-             break;
-           default:
-             abort ();
-             break;
+             /* We know local syms won't need a .plt entry, and if
+                they need a long branch stub we can't guarantee that
+                we can reach the stub.  So just flag an error later
+                if we're doing a shared link and find we need a long
+                branch stub.  */
+             continue;
+           }
+         else
+           {
+             /* Global symbols will need a .plt entry if they remain
+                global, and in most cases won't need a long branch
+                stub.  Unfortunately, we have to cater for the case
+                where a symbol is forced local by versioning, or due
+                to symbolic linking, and we lose the .plt entry.  */
+             need_entry = NEED_PLT | NEED_STUBREL;
+             if (h->elf.type == STT_PARISC_MILLI)
+               need_entry = NEED_STUBREL;
            }
          break;
 
-       case 32:
-         switch (field)
+       case R_PARISC_SEGBASE: /* Used to set segment base.  */
+       case R_PARISC_SEGREL32: /* Relative reloc, used for unwind.  */
+       case R_PARISC_PCREL14F: /* PC relative load/store.  */
+       case R_PARISC_PCREL14R:
+       case R_PARISC_PCREL17R: /* External branches.  */
+       case R_PARISC_PCREL21L: /* As above, and for load/store too.  */
+         /* We don't need to propagate the relocation if linking a
+            shared object since these are section relative.  */
+         continue;
+
+       case R_PARISC_DPREL14F: /* Used for gp rel data load/store.  */
+       case R_PARISC_DPREL14R:
+       case R_PARISC_DPREL21L:
+         if (info->shared)
            {
-           case e_fsel:
-             final_type = R_HPPA_PLABEL_32;
-             break;
-           default:
-             abort ();
-             break;
+             (*_bfd_error_handler)
+               (_("%s: relocation %s can not be used when making a shared object; recompile with -fPIC"),
+                bfd_get_filename (abfd),
+                elf_hppa_howto_table[r_type].name);
+             bfd_set_error (bfd_error_bad_value);
+             return false;
            }
+         /* Fall through.  */
+
+       case R_PARISC_DIR17F: /* Used for external branches.  */
+       case R_PARISC_DIR17R:
+       case R_PARISC_DIR14F: /* Used for load/store from absolute locn.  */
+       case R_PARISC_DIR14R:
+       case R_PARISC_DIR21L: /* As above, and for ext branches too.  */
+#if 1
+         /* Help debug shared library creation.  Any of the above
+            relocs can be used in shared libs, but they may cause
+            pages to become unshared.  */
+         if (info->shared)
+           {
+             (*_bfd_error_handler)
+               (_("%s: relocation %s should not be used when making a shared object; recompile with -fPIC"),
+                bfd_get_filename (abfd),
+                elf_hppa_howto_table[r_type].name);
+           }
+         /* Fall through.  */
+#endif
+
+       case R_PARISC_DIR32: /* .word relocs.  */
+         /* We may want to output a dynamic relocation later.  */
+         need_entry = NEED_DYNREL;
          break;
 
+         /* This relocation describes the C++ object vtable hierarchy.
+            Reconstruct it for later use during GC.  */
+       case R_PARISC_GNU_VTINHERIT:
+         if (!_bfd_elf32_gc_record_vtinherit (abfd, sec,
+                                              &h->elf, rel->r_offset))
+           return false;
+         continue;
+
+         /* This relocation describes which C++ vtable entries are actually
+            used.  Record for later use during GC.  */
+       case R_PARISC_GNU_VTENTRY:
+         if (!_bfd_elf32_gc_record_vtentry (abfd, sec,
+                                            &h->elf, rel->r_addend))
+           return false;
+         continue;
+
        default:
-         abort ();
-         break;
+         continue;
        }
 
-
-    case R_HPPA_ABS_CALL:
-      switch (format)
+      /* Now carry out our orders.  */
+      if (need_entry & NEED_GOT)
        {
-       case 11:
-         switch (field)
+         /* Allocate space for a GOT entry, as well as a dynamic
+            relocation for this entry.  */
+         if (dynobj == NULL)
+           hplink->root.dynobj = dynobj = abfd;
+
+         if (hplink->sgot == NULL)
            {
-           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;
+             if (! elf32_hppa_create_dynamic_sections (dynobj, info))
+               return false;
            }
-         break;
 
-       case 14:
-         switch (field)
+         if (h != NULL)
            {
-           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;
+             if (h->elf.got.refcount == -1)
+               h->elf.got.refcount = 1;
+             else
+               h->elf.got.refcount += 1;
            }
-         break;
+         else
+           {
+             /* This is a global offset table entry for a local symbol.  */
+             if (local_got_refcounts == NULL)
+               {
+                 bfd_size_type size;
+
+                 /* Allocate space for local got offsets and local
+                    plt offsets.  Done this way to save polluting
+                    elf_obj_tdata with another target specific
+                    pointer.  */
+                 size = symtab_hdr->sh_info;
+                 size *= 2 * sizeof (bfd_signed_vma);
+                 local_got_refcounts = ((bfd_signed_vma *)
+                                        bfd_alloc (abfd, size));
+                 if (local_got_refcounts == NULL)
+                   return false;
+                 elf_local_got_refcounts (abfd) = local_got_refcounts;
+                 memset (local_got_refcounts, -1, (size_t) size);
+               }
+             if (local_got_refcounts[r_symndx] == -1)
+               local_got_refcounts[r_symndx] = 1;
+             else
+               local_got_refcounts[r_symndx] += 1;
+           }
+       }
 
-       case 17:
-         switch (field)
+      if (need_entry & NEED_PLT)
+       {
+         /* If we are creating a shared library, and this is a reloc
+            against a weak symbol or a global symbol in a dynamic
+            object, then we will be creating an import stub and a
+            .plt entry for the symbol.  Similarly, on a normal link
+            to symbols defined in a dynamic object we'll need the
+            import stub and a .plt entry.  We don't know yet whether
+            the symbol is defined or not, so make an entry anyway and
+            clean up later in adjust_dynamic_symbol.  */
+         if ((sec->flags & SEC_ALLOC) != 0)
            {
-           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;
+             if (h != NULL)
+               {
+                 if (h->elf.plt.refcount == -1)
+                   {
+                     h->elf.plt.refcount = 1;
+                     h->elf.elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
+                   }
+                 else
+                   h->elf.plt.refcount += 1;
+
+                 /* If this .plt entry is for a plabel, mark it so
+                    that adjust_dynamic_symbol will keep the entry
+                    even if it appears to be local.  */
+                 if (need_entry & PLT_PLABEL)
+                   h->plabel = 1;
+               }
+             else if (need_entry & PLT_PLABEL)
+               {
+                 bfd_signed_vma *local_plt_refcounts;
+
+                 if (local_got_refcounts == NULL)
+                   {
+                     bfd_size_type size;
+
+                     /* Allocate space for local got offsets and local
+                        plt offsets.  */
+                     size = symtab_hdr->sh_info;
+                     size *= 2 * sizeof (bfd_signed_vma);
+                     local_got_refcounts = ((bfd_signed_vma *)
+                                            bfd_alloc (abfd, size));
+                     if (local_got_refcounts == NULL)
+                       return false;
+                     elf_local_got_refcounts (abfd) = local_got_refcounts;
+                     memset (local_got_refcounts, -1, (size_t) size);
+                   }
+                 local_plt_refcounts = (local_got_refcounts
+                                        + symtab_hdr->sh_info);
+                 if (local_plt_refcounts[r_symndx] == -1)
+                   local_plt_refcounts[r_symndx] = 1;
+                 else
+                   local_plt_refcounts[r_symndx] += 1;
+               }
            }
-         break;
+       }
 
-       case 21:
-         switch (field)
+      if (need_entry & (NEED_DYNREL | NEED_STUBREL))
+       {
+         /* Flag this symbol as having a non-got, non-plt reference
+            so that we generate copy relocs if it turns out to be
+            dynamic.  */
+         if (need_entry == NEED_DYNREL
+             && h != NULL
+             && !info->shared
+             && (sec->flags & SEC_READONLY) != 0)
+           h->elf.elf_link_hash_flags |= ELF_LINK_NON_GOT_REF;
+
+         /* If we are creating a shared library then we need to copy
+            the reloc into the shared library.  However, if we are
+            linking with -Bsymbolic, we need only copy absolute
+            relocs or relocs against symbols that are not defined in
+            an object we are including in the link.  PC- or DP- or
+            DLT-relative relocs against any local sym or global sym
+            with DEF_REGULAR set, can be discarded.  At this point we
+            have not seen all the input files, so it is possible that
+            DEF_REGULAR is not set now but will be set later (it is
+            never cleared).  We account for that possibility below by
+            storing information in the reloc_entries field of the
+            hash table entry.
+
+            A similar situation to the -Bsymbolic case occurs when
+            creating shared libraries and symbol visibility changes
+            render the symbol local.
+
+            As it turns out, all the relocs we will be creating here
+            are absolute, so we cannot remove them on -Bsymbolic
+            links or visibility changes anyway.  A STUB_REL reloc
+            is absolute too, as in that case it is the reloc in the
+            stub we will be creating, rather than copying the PCREL
+            reloc in the branch.
+
+            If on the other hand, we are creating an executable, we
+            may need to keep relocations for symbols satisfied by a
+            dynamic library if we manage to avoid copy relocs for the
+            symbol.  */
+         if ((info->shared
+              && (sec->flags & SEC_ALLOC) != 0
+              && (IS_ABSOLUTE_RELOC (r_type)
+                  || (h != NULL
+                      && (!info->symbolic
+                          || h->elf.root.type == bfd_link_hash_defweak
+                          || (h->elf.elf_link_hash_flags
+                              & ELF_LINK_HASH_DEF_REGULAR) == 0))))
+             || (!info->shared
+                 && (sec->flags & SEC_ALLOC) != 0
+                 && h != NULL
+                 && (h->elf.elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
+                 && (h->elf.root.type == bfd_link_hash_defweak
+                     || (h->elf.elf_link_hash_flags
+                         & ELF_LINK_HASH_DEF_REGULAR) == 0)))
            {
-           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;
+             boolean doit;
+             asection *srel;
+
+             srel = sreloc;
+             if ((need_entry & NEED_STUBREL))
+               srel = stubreloc;
+
+             /* Create a reloc section in dynobj and make room for
+                this reloc.  */
+             if (srel == NULL)
+               {
+                 char *name;
+
+                 if (dynobj == NULL)
+                   hplink->root.dynobj = dynobj = abfd;
+
+                 name = bfd_elf_string_from_elf_section
+                   (abfd,
+                    elf_elfheader (abfd)->e_shstrndx,
+                    elf_section_data (sec)->rel_hdr.sh_name);
+                 if (name == NULL)
+                   {
+                     (*_bfd_error_handler)
+                       (_("Could not find relocation section for %s"),
+                        sec->name);
+                     bfd_set_error (bfd_error_bad_value);
+                     return false;
+                   }
+
+                 if ((need_entry & NEED_STUBREL))
+                   {
+                     bfd_size_type len = strlen (name) + sizeof (STUB_SUFFIX);
+                     char *newname = bfd_malloc (len);
+
+                     if (newname == NULL)
+                       return false;
+                     strcpy (newname, name);
+                     strcpy (newname + len - sizeof (STUB_SUFFIX),
+                             STUB_SUFFIX);
+                     name = newname;
+                   }
+
+                 srel = bfd_get_section_by_name (dynobj, name);
+                 if (srel == NULL)
+                   {
+                     flagword flags;
+
+                     srel = bfd_make_section (dynobj, name);
+                     flags = (SEC_HAS_CONTENTS | SEC_READONLY
+                              | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+                     if ((sec->flags & SEC_ALLOC) != 0)
+                       flags |= SEC_ALLOC | SEC_LOAD;
+                     if (srel == NULL
+                         || !bfd_set_section_flags (dynobj, srel, flags)
+                         || !bfd_set_section_alignment (dynobj, srel, 2))
+                       return false;
+                   }
+                 else if ((need_entry & NEED_STUBREL))
+                   free (name);
+
+                 if ((need_entry & NEED_STUBREL))
+                   stubreloc = srel;
+                 else
+                   sreloc = srel;
+               }
+
+#if ! LONG_BRANCH_PIC_IN_SHLIB
+             /* If this is a function call, we only need one dynamic
+                reloc for the stub as all calls to a particular
+                function will go through the same stub.  Actually, a
+                long branch stub needs two relocations, but we count
+                on some intelligence on the part of the dynamic
+                linker.  */
+             if ((need_entry & NEED_STUBREL))
+               {
+                 doit = h->stub_reloc_sec != stubreloc;
+                 h->stub_reloc_sec = stubreloc;
+               }
+             else
+#endif
+               doit = 1;
+
+             if (doit)
+               {
+                 srel->_raw_size += sizeof (Elf32_External_Rela);
+
+                 /* Keep track of relocations we have entered for
+                    this global symbol, so that we can discard them
+                    later if necessary.  */
+                 if (!info->shared
+                     || (h != NULL
+                         && (! IS_ABSOLUTE_RELOC (rtype)
+                             || (need_entry & NEED_STUBREL))))
+                   {
+                     struct elf32_hppa_dyn_reloc_entry *p;
+
+                     for (p = h->reloc_entries; p != NULL; p = p->next)
+                       if (p->section == srel)
+                         break;
+
+                     if (p == NULL)
+                       {
+                         p = ((struct elf32_hppa_dyn_reloc_entry *)
+                              bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
+                         if (p == NULL)
+                           return false;
+                         p->next = h->reloc_entries;
+                         h->reloc_entries = p;
+                         p->section = srel;
+                         p->count = 0;
+                       }
+
+                     /* NEED_STUBREL and NEED_DYNREL are never both
+                        set.  Leave the count at zero for the
+                        NEED_STUBREL case as we only ever have one
+                        stub reloc per section per symbol, and this
+                        simplifies code to discard unneeded relocs.  */
+                     if (! (need_entry & NEED_STUBREL))
+                       ++p->count;
+                   }
+               }
            }
+       }
+    }
+
+  return true;
+}
+
+/* Return the section that should be marked against garbage collection
+   for a given relocation.  */
+
+static asection *
+elf32_hppa_gc_mark_hook (abfd, info, rel, h, sym)
+     bfd *abfd;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     Elf_Internal_Rela *rel;
+     struct elf_link_hash_entry *h;
+     Elf_Internal_Sym *sym;
+{
+  if (h != NULL)
+    {
+      switch ((unsigned int) ELF32_R_TYPE (rel->r_info))
+       {
+       case R_PARISC_GNU_VTINHERIT:
+       case R_PARISC_GNU_VTENTRY:
          break;
 
        default:
-         abort ();
-         break;
+         switch (h->root.type)
+           {
+           case bfd_link_hash_defined:
+           case bfd_link_hash_defweak:
+             return h->root.u.def.section;
+
+           case bfd_link_hash_common:
+             return h->root.u.c.p->section;
+
+           default:
+             break;
+           }
        }
-      break;
+    }
+  else
+    {
+      if (!(elf_bad_symtab (abfd)
+           && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
+         && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
+               && sym->st_shndx != SHN_COMMON))
+       {
+         return bfd_section_from_elf_index (abfd, sym->st_shndx);
+       }
+    }
 
+  return NULL;
+}
 
-    case R_HPPA_UNWIND:
-      final_type = R_HPPA_UNWIND_ENTRY;
-      break;
+/* Update the got and plt entry reference counts for the section being
+   removed.  */
 
+static boolean
+elf32_hppa_gc_sweep_hook (abfd, info, sec, relocs)
+     bfd *abfd;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  bfd_signed_vma *local_plt_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+  unsigned long r_symndx;
+  struct elf_link_hash_entry *h;
+  struct elf32_hppa_link_hash_table *hplink;
+  bfd *dynobj;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+  local_plt_refcounts = local_got_refcounts;
+  if (local_plt_refcounts != NULL)
+    local_plt_refcounts += symtab_hdr->sh_info;
+  hplink = hppa_link_hash_table (info);
+  dynobj = hplink->root.dynobj;
+  if (dynobj == NULL)
+    return true;
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    switch ((unsigned int) ELF32_R_TYPE (rel->r_info))
+      {
+      case R_PARISC_DLTIND14F:
+      case R_PARISC_DLTIND14R:
+      case R_PARISC_DLTIND21L:
+       r_symndx = ELF32_R_SYM (rel->r_info);
+       if (r_symndx >= symtab_hdr->sh_info)
+         {
+           h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+           if (h->got.refcount > 0)
+             h->got.refcount -= 1;
+         }
+       else if (local_got_refcounts != NULL)
+         {
+           if (local_got_refcounts[r_symndx] > 0)
+             local_got_refcounts[r_symndx] -= 1;
+         }
+       break;
+
+      case R_PARISC_PCREL12F:
+      case R_PARISC_PCREL17C:
+      case R_PARISC_PCREL17F:
+      case R_PARISC_PCREL22F:
+       r_symndx = ELF32_R_SYM (rel->r_info);
+       if (r_symndx >= symtab_hdr->sh_info)
+         {
+           h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+           if (h->plt.refcount > 0)
+             h->plt.refcount -= 1;
+         }
+       break;
 
-    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 ();
-      break;
-      
-    default:
-      final_type = base_type;
-      break;
-    }
+      case R_PARISC_PLABEL14R:
+      case R_PARISC_PLABEL21L:
+      case R_PARISC_PLABEL32:
+       r_symndx = ELF32_R_SYM (rel->r_info);
+       if (r_symndx >= symtab_hdr->sh_info)
+         {
+           h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+           if (h->plt.refcount > 0)
+             h->plt.refcount -= 1;
+         }
+       else if (local_plt_refcounts != NULL)
+         {
+           if (local_plt_refcounts[r_symndx] > 0)
+             local_plt_refcounts[r_symndx] -= 1;
+         }
+       break;
 
-  return final_types;
+      default:
+       break;
+      }
+
+  return true;
 }
 
-#undef final_type
+/* Our own version of hide_symbol, so that we can keep plt entries for
+   plabels.  */
 
+static void
+elf32_hppa_hide_symbol (info, h)
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     struct elf_link_hash_entry *h;
+{
+  if ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)
+    h->dynindx = -1;
+  if (! ((struct elf32_hppa_link_hash_entry *) h)->plabel)
+    {
+      h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+      h->plt.offset = (bfd_vma) -1;
+    }
+}
 
-/* Actually perform a relocation.  */
+/* This is the condition under which elf32_hppa_finish_dynamic_symbol
+   will be called from elflink.h.  If elflink.h doesn't call our
+   finish_dynamic_symbol routine, we'll need to do something about
+   initializing any .plt and .got entries in elf32_hppa_relocate_section.  */
+#define WILL_CALL_FINISH_DYNAMIC_SYMBOL(DYN, INFO, H) \
+  ((DYN)                                                               \
+   && ((INFO)->shared                                                  \
+       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)     \
+   && ((H)->dynindx != -1                                              \
+       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0))
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
 
-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;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
+static boolean
+elf32_hppa_adjust_dynamic_symbol (info, h)
+     struct bfd_link_info *info;
+     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;
+  bfd *dynobj;
+  struct elf32_hppa_link_hash_table *hplink;
+  asection *s;
+
+  hplink = hppa_link_hash_table (info);
+  dynobj = hplink->root.dynobj;
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
+    {
+      if (!info->shared
+         && h->plt.refcount > 0
+         && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
+         && (h->root.u.def.section->flags & SEC_HAS_GOT_REF) != 0)
+       {
+         ((struct elf32_hppa_link_hash_entry *) h)->maybe_pic_call = 1;
+       }
+
+      if (h->plt.refcount <= 0
+         || ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
+             && h->root.type != bfd_link_hash_defweak
+             && ! ((struct elf32_hppa_link_hash_entry *) h)->plabel
+             && (!info->shared || info->symbolic)))
+       {
+         /* The .plt entry is not needed when:
+            a) Garbage collection has removed all references to the
+            symbol, or
+            b) We know for certain the symbol is defined in this
+            object, and it's not a weak definition, nor is the symbol
+            used by a plabel relocation.  Either this object is the
+            application or we are doing a shared symbolic link.  */
+
+         /* As a special sop to the hppa ABI, we keep a .plt entry
+            for functions in sections containing PIC code.  */
+         if (((struct elf32_hppa_link_hash_entry *) h)->maybe_pic_call)
+           ((struct elf32_hppa_link_hash_entry *) h)->pic_call = 1;
+         else
+           {
+             h->plt.offset = (bfd_vma) -1;
+             h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+           }
+       }
+
+      return true;
+    }
 
-  /* If only performing a partial link, get out early.  */
-  if (output_bfd)
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->weakdef != NULL)
     {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
+      if (h->weakdef->root.type != bfd_link_hash_defined
+         && h->weakdef->root.type != bfd_link_hash_defweak)
+       abort ();
+      h->root.u.def.section = h->weakdef->root.u.def.section;
+      h->root.u.def.value = h->weakdef->root.u.def.value;
+      return true;
     }
 
-  /* 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;
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return true;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
+    return true;
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  s = hplink->sdynbss;
+
+  /* We must generate a COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
 
-  /* Get the final relocated value.  */
-  sym_value = get_symbol_value (symbol_in);
+      srel = hplink->srelbss;
+      srel->_raw_size += sizeof (Elf32_External_Rela);
+      h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
+    }
 
-  /* 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.
+  {
+    /* We need to figure out the alignment required for this symbol.  I
+       have no idea how other ELF linkers handle this.  */
+    unsigned int power_of_two;
+
+    power_of_two = bfd_log2 (h->size);
+    if (power_of_two > 3)
+      power_of_two = 3;
+
+    /* Apply the required alignment.  */
+    s->_raw_size = BFD_ALIGN (s->_raw_size,
+                             (bfd_size_type) (1 << power_of_two));
+    if (power_of_two > bfd_get_section_alignment (dynobj, s))
+      {
+       if (! bfd_set_section_alignment (dynobj, s, power_of_two))
+         return false;
+      }
+  }
+  /* Define the symbol as being at this point in the section.  */
+  h->root.u.def.section = s;
+  h->root.u.def.value = s->_raw_size;
+
+  /* Increment the section size to make room for the symbol.  */
+  s->_raw_size += h->size;
+
+  return true;
+}
 
-     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)
+/* Called via elf_link_hash_traverse to create .plt entries for an
+   application that uses statically linked PIC functions.  Similar to
+   the first part of elf32_hppa_adjust_dynamic_symbol.  */
+
+static boolean
+hppa_handle_PIC_calls (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf ATTRIBUTE_UNUSED;
+{
+  if (! (h->plt.refcount > 0
+        && (h->root.type == bfd_link_hash_defined
+            || h->root.type == bfd_link_hash_defweak)
+        && (h->root.u.def.section->flags & SEC_HAS_GOT_REF) != 0))
     {
-      if (global_symbol)
+      h->plt.offset = (bfd_vma) -1;
+      h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+      return true;
+    }
+
+  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
+  ((struct elf32_hppa_link_hash_entry *) h)->maybe_pic_call = 1;
+  ((struct elf32_hppa_link_hash_entry *) h)->pic_call = 1;
+
+  return true;
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   global syms.  */
+
+static boolean
+allocate_plt_and_got_and_discard_relocs (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf;
+{
+  struct bfd_link_info *info;
+  struct elf32_hppa_link_hash_table *hplink;
+  asection *s;
+  struct elf32_hppa_link_hash_entry *eh;
+
+  if (h->root.type == bfd_link_hash_indirect
+      || h->root.type == bfd_link_hash_warning)
+    return true;
+
+  info = (struct bfd_link_info *) inf;
+  hplink = hppa_link_hash_table (info);
+  if ((hplink->root.dynamic_sections_created
+       && h->plt.refcount > 0)
+      || ((struct elf32_hppa_link_hash_entry *) h)->pic_call)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+        Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+         && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0
+         && h->type != STT_PARISC_MILLI
+         && !((struct elf32_hppa_link_hash_entry *) h)->pic_call)
        {
-         global_value = (global_symbol->value
-                         + global_symbol->section->output_section->vma
-                         + global_symbol->section->output_offset);
-         GOT_value = global_value;
-         global_sym_defined++;
+         if (! bfd_elf32_link_record_dynamic_symbol (info, h))
+           return false;
+       }
+
+      /* Make an entry in the .plt section.  */
+      s = hplink->splt;
+      h->plt.offset = s->_raw_size;
+      if (PLABEL_PLT_ENTRY_SIZE != PLT_ENTRY_SIZE
+         && ((struct elf32_hppa_link_hash_entry *) h)->plabel
+         && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+       {
+         /* Add some extra space for the dynamic linker to use.  */
+         s->_raw_size += PLABEL_PLT_ENTRY_SIZE;
+       }
+      else
+       s->_raw_size += PLT_ENTRY_SIZE;
+
+      if (! ((struct elf32_hppa_link_hash_entry *) h)->pic_call
+         && WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
+       {
+         /* We also need to make an entry in the .rela.plt section.  */
+         hplink->srelplt->_raw_size += sizeof (Elf32_External_Rela);
+         hplink->need_plt_stub = 1;
        }
     }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+    }
 
-  /* Get the instruction word.  */
-  insn = bfd_get_32 (abfd, hit_data);
+  if (h->got.refcount > 0)
+    {
+      boolean dyn;
 
-  /* Relocate the value based on one of the basic relocation types
+      /* Make sure this symbol is output as a dynamic symbol.
+        Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+         && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0
+         && h->type != STT_PARISC_MILLI)
+       {
+         if (! bfd_elf32_link_record_dynamic_symbol (info, h))
+           return false;
+       }
 
-   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  */
+      s = hplink->sgot;
+      h->got.offset = s->_raw_size;
+      s->_raw_size += GOT_ENTRY_SIZE;
+      dyn = hplink->root.dynamic_sections_created;
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, h))
+       hplink->srelgot->_raw_size += sizeof (Elf32_External_Rela);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  /* If this is a -Bsymbolic shared link, then we need to discard all
+     space allocated for dynamic relocs against symbols defined in a
+     regular object.  For the normal shared case, discard space for
+     relocs that have become local due to symbol visibility changes.
+     For the non-shared case, discard space for symbols which turn out
+     to need copy relocs or are not dynamic.  We also need to lose
+     relocs we've allocated for long branch stubs if we know we won't
+     be generating a stub.  */
+
+  eh = (struct elf32_hppa_link_hash_entry *) h;
+  if (eh->reloc_entries == NULL)
+    return true;
+
+  /* First handle the non-shared case.  */
+  if (!info->shared
+      && (h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
+      && (((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
+          && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
+         || (hplink->root.dynamic_sections_created
+             && (h->root.type == bfd_link_hash_undefweak
+                 || h->root.type == bfd_link_hash_undefined))))
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+        Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+         && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0
+         && h->type != STT_PARISC_MILLI)
+       {
+         if (! bfd_elf32_link_record_dynamic_symbol (info, h))
+           return false;
+       }
 
-  switch (r_type)
+      /* If that succeeded, we know we'll be keeping all the relocs.  */
+      if (h->dynindx != -1)
+       return true;
+    }
+
+#if ! LONG_BRANCH_PIC_IN_SHLIB && LONG_BRANCH_VIA_PLT
+  /* Handle the stub reloc case.  If we have a plt entry for the
+     function, we won't be needing long branch stubs.  c->count will
+     only be zero for stub relocs, which provides a handy way of
+     flagging these relocs, and means we need do nothing special for
+     the forced local and symbolic link case.  */
+  if (eh->stub_reloc_sec != NULL
+      && eh->elf.plt.offset != (bfd_vma) -1)
     {
-    case R_HPPA_NONE:
-      break;
+      struct elf32_hppa_dyn_reloc_entry *c;
 
-    /* Handle all the basic type 1 relocations.  */
-    case R_HPPA_32:
-    case R_HPPA_11:
-    case R_HPPA_14:
-    case R_HPPA_17:
-      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;
+      for (c = eh->reloc_entries; c != NULL; c = c->next)
+       if (c->count == 0)
+         c->section->_raw_size -= sizeof (Elf32_External_Rela);
+    }
+#endif
+
+  /* Discard any relocs in the non-shared case.  For the shared case,
+     if a symbol has been forced local or we have found a regular
+     definition for the symbolic link case, then we won't be needing
+     any relocs.  */
+  if (!info->shared
+      || ((eh->elf.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
+         && ((eh->elf.elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0
+             || info->symbolic)))
+    {
+      struct elf32_hppa_dyn_reloc_entry *c;
 
-    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;
+      for (c = eh->reloc_entries; c != NULL; c = c->next)
+       c->section->_raw_size -= c->count * sizeof (Elf32_External_Rela);
+    }
 
-    /* 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:
-      r_field = e_lrsel;
-      goto do_basic_type_2;
-    case R_HPPA_GOTOFF_RR14:
-      r_field = e_rrsel;
+  return true;
+}
 
-    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;
+/* This function is called via elf_link_hash_traverse to force
+   millicode symbols local so they do not end up as globals in the
+   dynamic symbol table.  We ought to be able to do this in
+   adjust_dynamic_symbol, but our adjust_dynamic_symbol is not called
+   for all dynamic symbols.  Arguably, this is a bug in
+   elf_adjust_dynamic_symbol.  */
 
-    /* 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:
-      r_field = e_rrsel;
+static boolean
+clobber_millicode_symbols (h, info)
+     struct elf_link_hash_entry *h;
+     struct bfd_link_info *info;
+{
+  /* We only want to remove these from the dynamic symbol table.
+     Therefore we do not leave ELF_LINK_FORCED_LOCAL set.  */
+  if (h->type == STT_PARISC_MILLI)
+    {
+      unsigned short oldflags = h->elf_link_hash_flags;
+      h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
+      elf32_hppa_hide_symbol (info, h);
+      h->elf_link_hash_flags &= ~ELF_LINK_FORCED_LOCAL;
+      h->elf_link_hash_flags |= oldflags & ELF_LINK_FORCED_LOCAL;
+    }
+  return true;
+}
 
-    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;
+/* Set the sizes of the dynamic sections.  */
 
-    /* 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:
-      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;
+static boolean
+elf32_hppa_size_dynamic_sections (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  struct elf32_hppa_link_hash_table *hplink;
+  bfd *dynobj;
+  bfd *i;
+  asection *s;
+  boolean relocs;
+  boolean reltext;
+
+  hplink = hppa_link_hash_table (info);
+  dynobj = hplink->root.dynobj;
+  if (dynobj == NULL)
+    abort ();
+
+  if (hplink->root.dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (! info->shared)
+       {
+         s = bfd_get_section_by_name (dynobj, ".interp");
+         if (s == NULL)
+           abort ();
+         s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
+         s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+       }
 
-    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;
+      /* Force millicode symbols local.  */
+      elf_link_hash_traverse (&hplink->root,
+                             clobber_millicode_symbols,
+                             info);
+    }
+  else
+    {
+      /* Run through the function symbols, looking for any that are
+        PIC, and allocate space for the necessary .plt entries so
+        that %r19 will be set up.  */
+      if (! info->shared)
+       elf_link_hash_traverse (&hplink->root,
+                               hppa_handle_PIC_calls,
+                               info);
+    }
 
-    /* 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;
+  /* Set up .got and .plt offsets for local syms.  */
+  for (i = info->input_bfds; i; i = i->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      bfd_signed_vma *local_plt;
+      bfd_signed_vma *end_local_plt;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (bfd_get_flavour (i) != bfd_target_elf_flavour)
+       continue;
+
+      local_got = elf_local_got_refcounts (i);
+      if (!local_got)
+       continue;
+
+      symtab_hdr = &elf_tdata (i)->symtab_hdr;
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      s = hplink->sgot;
+      srel = hplink->srelgot;
+      for (; local_got < end_local_got; ++local_got)
+       {
+         if (*local_got > 0)
+           {
+             *local_got = s->_raw_size;
+             s->_raw_size += GOT_ENTRY_SIZE;
+             if (info->shared)
+               srel->_raw_size += sizeof (Elf32_External_Rela);
+           }
+         else
+           *local_got = (bfd_vma) -1;
+       }
 
-    /* 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);
-        }
+      local_plt = end_local_got;
+      end_local_plt = local_plt + locsymcount;
+      if (! hplink->root.dynamic_sections_created)
+       {
+         /* Won't be used, but be safe.  */
+         for (; local_plt < end_local_plt; ++local_plt)
+           *local_plt = (bfd_vma) -1;
+       }
       else
        {
-         /* 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)
+         s = hplink->splt;
+         srel = hplink->srelplt;
+         for (; local_plt < end_local_plt; ++local_plt)
            {
-             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)
+             if (*local_plt > 0)
                {
-                 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;
+                 *local_plt = s->_raw_size;
+                 s->_raw_size += PLT_ENTRY_SIZE;
+                 if (info->shared)
+                   srel->_raw_size += sizeof (Elf32_External_Rela);
                }
-              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
-               {
-                 /* 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;
-               }
+               *local_plt = (bfd_vma) -1;
            }
-         /* 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
+       }
+    }
+
+  /* Allocate global sym .plt and .got entries.  Also discard all
+     unneeded relocs.  */
+  elf_link_hash_traverse (&hplink->root,
+                         allocate_plt_and_got_and_discard_relocs,
+                         (PTR) info);
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  relocs = false;
+  reltext = false;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+       continue;
+
+      if (s == hplink->splt)
+       {
+         if (hplink->need_plt_stub)
            {
-             /* 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;
+             /* Make space for the plt stub at the end of the .plt
+                section.  We want this stub right at the end, up
+                against the .got section.  */
+             int gotalign = bfd_section_alignment (dynobj, hplink->sgot);
+             int pltalign = bfd_section_alignment (dynobj, s);
+             bfd_size_type mask;
+
+             if (gotalign > pltalign)
+               bfd_set_section_alignment (dynobj, s, gotalign);
+             mask = ((bfd_size_type) 1 << gotalign) - 1;
+             s->_raw_size = (s->_raw_size + sizeof (plt_stub) + mask) & ~mask;
            }
        }
-      break;
-      
-    /* Something we don't know how to handle.  */
-    default:
-      *error_message = (char *) "Unrecognized reloc";
-      return bfd_reloc_notsupported;
-    }
+      else if (s == hplink->sgot)
+       ;
+      else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0)
+       {
+         if (s->_raw_size != 0)
+           {
+             asection *target;
+             const char *outname;
+
+             /* Remember whether there are any reloc sections other
+                than .rela.plt.  */
+             if (s != hplink->srelplt)
+               relocs = true;
+
+             /* If this relocation section applies to a read only
+                section, then we probably need a DT_TEXTREL entry.  */
+             outname = bfd_get_section_name (output_bfd,
+                                             s->output_section);
+             target = bfd_get_section_by_name (output_bfd, outname + 5);
+             if (target != NULL
+                 && (target->flags & SEC_READONLY) != 0
+                 && (target->flags & SEC_ALLOC) != 0)
+               reltext = true;
+
+             /* We use the reloc_count field as a counter if we need
+                to copy relocs into the output file.  */
+             s->reloc_count = 0;
+           }
+       }
+      else
+       {
+         /* It's not one of our sections, so don't allocate space.  */
+         continue;
+       }
 
-  /* Update the instruction word.  */
-  bfd_put_32 (abfd, insn, hit_data);
-  return (bfd_reloc_ok);
-}
+      if (s->_raw_size == 0)
+       {
+         /* If we don't need this section, strip it from the
+            output file.  This is mostly to handle .rela.bss and
+            .rela.plt.  We must create both sections in
+            create_dynamic_sections, because they must be created
+            before the linker maps input sections to output
+            sections.  The linker does that before
+            adjust_dynamic_symbol is called, and it is that
+            function which decides whether anything needs to go
+            into these sections.  */
+         _bfd_strip_section_from_output (info, s);
+         continue;
+       }
 
-/* Return the address of the howto table entry to perform the CODE
-   relocation for an ARCH machine.  */
+      /* Allocate memory for the section contents.  Zero it, because
+        we may not fill in all the reloc sections.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
+      if (s->contents == NULL && s->_raw_size != 0)
+       return false;
+    }
 
-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)
+  if (hplink->root.dynamic_sections_created)
     {
-      BFD_ASSERT ((int) elf_hppa_howto_table[(int) code].type == (int) code);
-      return &elf_hppa_howto_table[(int) code];
+      /* Like IA-64 and HPPA64, always create a DT_PLTGOT.  It
+        actually has nothing to do with the PLT, it is how we
+        communicate the LTP value of a load module to the dynamic
+        linker.  */
+#define add_dynamic_entry(TAG, VAL) \
+  bfd_elf32_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL))
+
+      if (!add_dynamic_entry (DT_PLTGOT, 0))
+       return false;
+
+      /* Add some entries to the .dynamic section.  We fill in the
+        values later, in elf32_hppa_finish_dynamic_sections, but we
+        must add the entries now so that we get the correct size for
+        the .dynamic section.  The DT_DEBUG entry is filled in by the
+        dynamic linker and used by the debugger.  */
+      if (!info->shared)
+       {
+         if (!add_dynamic_entry (DT_DEBUG, 0))
+           return false;
+       }
+
+      if (hplink->srelplt->_raw_size != 0)
+       {
+         if (!add_dynamic_entry (DT_PLTRELSZ, 0)
+             || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+             || !add_dynamic_entry (DT_JMPREL, 0))
+           return false;
+       }
+
+      if (relocs)
+       {
+         if (!add_dynamic_entry (DT_RELA, 0)
+             || !add_dynamic_entry (DT_RELASZ, 0)
+             || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+           return false;
+       }
+
+      if (reltext)
+       {
+         if (!add_dynamic_entry (DT_TEXTREL, 0))
+           return false;
+         info->flags |= DF_TEXTREL;
+       }
     }
-  return NULL;
+#undef add_dynamic_entry
+
+  return true;
 }
 
+/* External entry points for sizing and building linker stubs.  */
 
-/* Update the symbol extention chain to include the symbol pointed to
-   by SYMBOLP if SYMBOLP is a function symbol.  Used internally and by GAS.  */
+/* Determine and set the size of the stub section for a final link.
 
-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;
+   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.  */
+
+boolean
+elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
+                      add_stub_section, layout_sections_again)
+     bfd *output_bfd;
+     bfd *stub_bfd;
+     struct bfd_link_info *info;
+     boolean multi_subspace;
+     bfd_signed_vma group_size;
+     asection * (*add_stub_section) PARAMS ((const char *, asection *));
+     void (*layout_sections_again) PARAMS ((void));
 {
-  symext_chainS *symextP;
-  unsigned int arg_reloc;
+  bfd *input_bfd;
+  asection *section;
+  asection **input_list, **list;
+  Elf_Internal_Sym *local_syms, **all_local_syms;
+  unsigned int bfd_indx, bfd_count;
+  int top_id, top_index;
+  struct elf32_hppa_link_hash_table *hplink;
+  bfd_size_type stub_group_size;
+  boolean stubs_always_before_branch;
+  boolean stub_changed = 0;
+  boolean ret = 0;
+  bfd_size_type amt;
+
+  hplink = hppa_link_hash_table (info);
+
+  /* Stash our params away.  */
+  hplink->stub_bfd = stub_bfd;
+  hplink->multi_subspace = multi_subspace;
+  hplink->add_stub_section = add_stub_section;
+  hplink->layout_sections_again = layout_sections_again;
+  stubs_always_before_branch = group_size < 0;
+  if (group_size < 0)
+    stub_group_size = -group_size;
+  else
+    stub_group_size = group_size;
+  if (stub_group_size == 1)
+    {
+      /* Default values.  */
+      stub_group_size = 8000000;
+      if (hplink->has_17bit_branch || hplink->multi_subspace)
+       stub_group_size = 250000;
+      if (hplink->has_12bit_branch)
+       stub_group_size = 7812;
+    }
 
-  /* Only functions can have argument relocations.  */
-  if (!(symbolP->symbol.flags & BSF_FUNCTION))
-    return;
+  /* Count the number of input BFDs and find the top input section id.  */
+  for (input_bfd = info->input_bfds, bfd_count = 0, top_id = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    {
+      bfd_count += 1;
+      for (section = input_bfd->sections;
+          section != NULL;
+          section = section->next)
+       {
+         if (top_id < section->id)
+           top_id = section->id;
+       }
+    }
 
-  arg_reloc = symbolP->tc_data.hppa_arg_reloc;
+  amt = sizeof (struct map_stub) * (top_id + 1);
+  hplink->stub_group = (struct map_stub *) bfd_zmalloc (amt);
+  if (hplink->stub_group == NULL)
+    return false;
 
-  /* 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;
+  /* Make a list of input sections for each output section included in
+     the link.
 
-  /* Allocate memory and initialize this entry.  */
-  symextP = (symext_chainS *) bfd_alloc (abfd, sizeof (symext_chainS) * 2);
-  if (!symextP)
+     We can't use output_bfd->section_count here to find the top output
+     section index as some sections may have been removed, and
+     _bfd_strip_section_from_output doesn't renumber the indices.  */
+  for (section = output_bfd->sections, top_index = 0;
+       section != NULL;
+       section = section->next)
     {
-      bfd_set_error (bfd_error_no_memory);
-      abort();                 /* FIXME */
+      if (top_index < section->index)
+       top_index = section->index;
     }
 
-  symextP[0].entry = ELF32_HPPA_SX_WORD (HPPA_SXT_SYMNDX, sym_idx);
-  symextP[0].next = &symextP[1];
+  amt = sizeof (asection *) * (top_index + 1);
+  input_list = (asection **) bfd_malloc (amt);
+  if (input_list == NULL)
+    return false;
+
+  /* For sections we aren't interested in, mark their entries with a
+     value we can check later.  */
+  list = input_list + top_index;
+  do
+    *list = bfd_abs_section_ptr;
+  while (list-- != input_list);
+
+  for (section = output_bfd->sections;
+       section != NULL;
+       section = section->next)
+    {
+      if ((section->flags & SEC_CODE) != 0)
+       input_list[section->index] = NULL;
+    }
 
-  symextP[1].entry = ELF32_HPPA_SX_WORD (HPPA_SXT_ARG_RELOC, arg_reloc);
-  symextP[1].next = NULL;
+  /* Now actually build the lists.  */
+  for (input_bfd = info->input_bfds;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    {
+      for (section = input_bfd->sections;
+          section != NULL;
+          section = section->next)
+       {
+         if (section->output_section != NULL
+             && section->output_section->owner == output_bfd
+             && section->output_section->index <= top_index)
+           {
+             list = input_list + section->output_section->index;
+             if (*list != bfd_abs_section_ptr)
+               {
+                 /* Steal the link_sec pointer for our list.  */
+#define PREV_SEC(sec) (hplink->stub_group[(sec)->id].link_sec)
+                 /* This happens to make the list in reverse order,
+                    which is what we want.  */
+                 PREV_SEC (section) = *list;
+                 *list = section;
+               }
+           }
+       }
+    }
 
-  /* Now update the chain itself so it can be walked later to build
-     the symbol extension section.  */
-  if (*symext_root == NULL)
+  /* See whether we can group stub sections together.  Grouping stub
+     sections may result in fewer stubs.  More importantly, we need to
+     put all .init* and .fini* stubs at the beginning of the .init or
+     .fini output sections respectively, because glibc splits the
+     _init and _fini functions into multiple parts.  Putting a stub in
+     the middle of a function is not a good idea.  */
+  list = input_list + top_index;
+  do
     {
-      *symext_root = &symextP[0];
-      *symext_last = &symextP[1];
+      asection *tail = *list;
+      if (tail == bfd_abs_section_ptr)
+       continue;
+      while (tail != NULL)
+       {
+         asection *curr;
+         asection *prev;
+         bfd_size_type total;
+
+         curr = tail;
+         if (tail->_cooked_size)
+           total = tail->_cooked_size;
+         else
+           total = tail->_raw_size;
+         while ((prev = PREV_SEC (curr)) != NULL
+                && ((total += curr->output_offset - prev->output_offset)
+                    < stub_group_size))
+           curr = prev;
+
+         /* OK, the size from the start of CURR to the end is less
+            than 250000 bytes and thus can be handled by one stub
+            section.  (or the tail section is itself larger than
+            250000 bytes, in which case we may be toast.)
+            We should really be keeping track of the total size of
+            stubs added here, as stubs contribute to the final output
+            section size.  That's a little tricky, and this way will
+            only break if stubs added total more than 12144 bytes, or
+            1518 long branch stubs.  It seems unlikely for more than
+            1518 different functions to be called, especially from
+            code only 250000 bytes long.  */
+         do
+           {
+             prev = PREV_SEC (tail);
+             /* Set up this stub group.  */
+             hplink->stub_group[tail->id].link_sec = curr;
+           }
+         while (tail != curr && (tail = prev) != NULL);
+
+         /* But wait, there's more!  Input sections up to 250000
+            bytes before the stub section can be handled by it too.  */
+         if (!stubs_always_before_branch)
+           {
+             total = 0;
+             while (prev != NULL
+                    && ((total += tail->output_offset - prev->output_offset)
+                        < stub_group_size))
+               {
+                 tail = prev;
+                 prev = PREV_SEC (tail);
+                 hplink->stub_group[tail->id].link_sec = curr;
+               }
+           }
+         tail = prev;
+       }
     }
-  else
+  while (list-- != input_list);
+  free (input_list);
+#undef PREV_SEC
+
+  /* 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.  */
+  amt = sizeof (Elf_Internal_Sym *) * bfd_count;
+  all_local_syms = (Elf_Internal_Sym **) bfd_zmalloc (amt);
+  if (all_local_syms == NULL)
+    return false;
+
+  /* Walk over all the input BFDs, swapping in local symbols.
+     If we are creating a shared library, create hash entries for the
+     export stubs.  */
+  for (input_bfd = info->input_bfds, bfd_indx = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next, bfd_indx++)
     {
-      (*symext_last)->next = &symextP[0];
-      *symext_last = &symextP[1];
+      Elf_Internal_Shdr *symtab_hdr;
+      Elf_Internal_Sym *isym;
+      Elf32_External_Sym *ext_syms, *esym, *end_sy;
+      bfd_size_type sec_size;
+
+      /* 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.  */
+      sec_size = symtab_hdr->sh_info;
+      sec_size *= sizeof (Elf_Internal_Sym);
+      local_syms = (Elf_Internal_Sym *) bfd_malloc (sec_size);
+      if (local_syms == NULL)
+       {
+         goto error_ret_free_local;
+       }
+      all_local_syms[bfd_indx] = local_syms;
+      sec_size = symtab_hdr->sh_info;
+      sec_size *= sizeof (Elf32_External_Sym);
+      ext_syms = (Elf32_External_Sym *) bfd_malloc (sec_size);
+      if (ext_syms == NULL)
+       {
+         goto error_ret_free_local;
+       }
+
+      if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
+         || (bfd_bread (ext_syms, sec_size, input_bfd) != sec_size))
+       {
+         free (ext_syms);
+         goto error_ret_free_local;
+       }
+
+      /* Swap the local symbols in.  */
+      isym = local_syms;
+      esym = ext_syms;
+      for (end_sy = esym + symtab_hdr->sh_info; esym < end_sy; esym++, isym++)
+       bfd_elf32_swap_symbol_in (input_bfd, esym, isym);
+
+      /* Now we can free the external symbols.  */
+      free (ext_syms);
+
+#if ! LONG_BRANCH_PIC_IN_SHLIB
+      /* If this is a shared link, find all the stub reloc sections.  */
+      if (info->shared)
+       for (section = input_bfd->sections;
+            section != NULL;
+            section = section->next)
+         {
+           char *name;
+           asection *reloc_sec;
+
+           name = bfd_malloc ((bfd_size_type) strlen (section->name)
+                              + sizeof STUB_SUFFIX
+                              + 5);
+           if (name == NULL)
+             return false;
+           sprintf (name, ".rela%s%s", section->name, STUB_SUFFIX);
+           reloc_sec = bfd_get_section_by_name (hplink->root.dynobj, name);
+           hplink->stub_group[section->id].reloc_sec = reloc_sec;
+           free (name);
+         }
+#endif
+
+      if (info->shared && hplink->multi_subspace)
+       {
+         struct elf_link_hash_entry **sym_hashes;
+         struct elf_link_hash_entry **end_hashes;
+         unsigned int symcount;
+
+         symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+                     - symtab_hdr->sh_info);
+         sym_hashes = elf_sym_hashes (input_bfd);
+         end_hashes = sym_hashes + symcount;
+
+         /* Look through the global syms for functions;  We need to
+            build export stubs for all globally visible functions.  */
+         for (; sym_hashes < end_hashes; sym_hashes++)
+           {
+             struct elf32_hppa_link_hash_entry *hash;
+
+             hash = (struct elf32_hppa_link_hash_entry *) *sym_hashes;
+
+             while (hash->elf.root.type == bfd_link_hash_indirect
+                    || hash->elf.root.type == bfd_link_hash_warning)
+               hash = ((struct elf32_hppa_link_hash_entry *)
+                       hash->elf.root.u.i.link);
+
+             /* At this point in the link, undefined syms have been
+                resolved, so we need to check that the symbol was
+                defined in this BFD.  */
+             if ((hash->elf.root.type == bfd_link_hash_defined
+                  || hash->elf.root.type == bfd_link_hash_defweak)
+                 && hash->elf.type == STT_FUNC
+                 && hash->elf.root.u.def.section->output_section != NULL
+                 && (hash->elf.root.u.def.section->output_section->owner
+                     == output_bfd)
+                 && hash->elf.root.u.def.section->owner == input_bfd
+                 && (hash->elf.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)
+                 && !(hash->elf.elf_link_hash_flags & ELF_LINK_FORCED_LOCAL)
+                 && ELF_ST_VISIBILITY (hash->elf.other) == STV_DEFAULT)
+               {
+                 asection *sec;
+                 const char *stub_name;
+                 struct elf32_hppa_stub_hash_entry *stub_entry;
+
+                 sec = hash->elf.root.u.def.section;
+                 stub_name = hash->elf.root.root.string;
+                 stub_entry = hppa_stub_hash_lookup (&hplink->stub_hash_table,
+                                                     stub_name,
+                                                     false, false);
+                 if (stub_entry == NULL)
+                   {
+                     stub_entry = hppa_add_stub (stub_name, sec, hplink);
+                     if (!stub_entry)
+                       goto error_ret_free_local;
+
+                     stub_entry->target_value = hash->elf.root.u.def.value;
+                     stub_entry->target_section = hash->elf.root.u.def.section;
+                     stub_entry->stub_type = hppa_stub_export;
+                     stub_entry->h = hash;
+                     stub_changed = 1;
+                   }
+                 else
+                   {
+                     (*_bfd_error_handler) (_("%s: duplicate export stub %s"),
+                            bfd_get_filename (input_bfd),
+                            stub_name);
+                   }
+               }
+           }
+       }
     }
-}
 
-/* Build the symbol extension section.  Used internally and by GAS.  */ 
+  while (1)
+    {
+      asection *stub_sec;
+
+      for (input_bfd = info->input_bfds, bfd_indx = 0;
+          input_bfd != NULL;
+          input_bfd = input_bfd->link_next, bfd_indx++)
+       {
+         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[bfd_indx];
+
+         /* Walk over each section attached to the input bfd.  */
+         for (section = input_bfd->sections;
+              section != NULL;
+              section = section->next)
+           {
+             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 more
+                to do.  */
+             if ((section->flags & SEC_RELOC) == 0
+                 || section->reloc_count == 0)
+               continue;
+
+             /* If this section is a link-once section that will be
+                discarded, then don't create any stubs.  */
+             if (section->output_section == NULL
+                 || section->output_section->owner != output_bfd)
+               continue;
+
+             /* Allocate space for the external relocations.  */
+             amt = section->reloc_count;
+             amt *= sizeof (Elf32_External_Rela);
+             external_relocs = (Elf32_External_Rela *) bfd_malloc (amt);
+             if (external_relocs == NULL)
+               {
+                 goto error_ret_free_local;
+               }
+
+             /* Likewise for the internal relocations.  */
+             amt = section->reloc_count;
+             amt *= sizeof (Elf_Internal_Rela);
+             internal_relocs = (Elf_Internal_Rela *) bfd_malloc (amt);
+             if (internal_relocs == NULL)
+               {
+                 free (external_relocs);
+                 goto error_ret_free_local;
+               }
+
+             /* 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_bread (external_relocs,
+                              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;
+               }
+
+             /* 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);
+
+             /* We're done with the external relocs, free them.  */
+             free (external_relocs);
+
+             /* Now examine each relocation.  */
+             irela = internal_relocs;
+             irelaend = irela + section->reloc_count;
+             for (; irela < irelaend; irela++)
+               {
+                 unsigned int r_type, r_indx;
+                 enum elf32_hppa_stub_type stub_type;
+                 struct elf32_hppa_stub_hash_entry *stub_entry;
+                 asection *sym_sec;
+                 bfd_vma sym_value;
+                 bfd_vma destination;
+                 struct elf32_hppa_link_hash_entry *hash;
+                 char *stub_name;
+                 const asection *id_sec;
+
+                 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;
+                   }
+
+                 /* Only look for stubs on call instructions.  */
+                 if (r_type != (unsigned int) R_PARISC_PCREL12F
+                     && r_type != (unsigned int) R_PARISC_PCREL17F
+                     && r_type != (unsigned int) R_PARISC_PCREL22F)
+                   continue;
+
+                 /* Now determine the call target, its name, value,
+                    section.  */
+                 sym_sec = NULL;
+                 sym_value = 0;
+                 destination = 0;
+                 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;
+                     if (ELF_ST_TYPE (sym->st_info) != STT_SECTION)
+                       sym_value = 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;
+
+                     e_indx = r_indx - symtab_hdr->sh_info;
+                     hash = ((struct elf32_hppa_link_hash_entry *)
+                             elf_sym_hashes (input_bfd)[e_indx]);
 
-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;
+                     while (hash->elf.root.type == bfd_link_hash_indirect
+                            || hash->elf.root.type == bfd_link_hash_warning)
+                       hash = ((struct elf32_hppa_link_hash_entry *)
+                               hash->elf.root.u.i.link);
 
-  /* FIXME: Huh?  I don't see what this is supposed to do for us.  */
-  hppa_elf_stub_finish (abfd);
+                     if (hash->elf.root.type == bfd_link_hash_defined
+                         || hash->elf.root.type == bfd_link_hash_defweak)
+                       {
+                         sym_sec = hash->elf.root.u.def.section;
+                         sym_value = hash->elf.root.u.def.value;
+                         if (sym_sec->output_section != NULL)
+                           destination = (sym_value + irela->r_addend
+                                          + sym_sec->output_offset
+                                          + sym_sec->output_section->vma);
+                       }
+                     else if (hash->elf.root.type == bfd_link_hash_undefweak)
+                       {
+                         if (! info->shared)
+                           continue;
+                       }
+                     else if (hash->elf.root.type == bfd_link_hash_undefined)
+                       {
+                         if (! (info->shared
+                                && !info->no_undefined
+                                && (ELF_ST_VISIBILITY (hash->elf.other)
+                                    == STV_DEFAULT)))
+                           continue;
+                       }
+                     else
+                       {
+                         bfd_set_error (bfd_error_bad_value);
+                         goto error_ret_free_internal;
+                       }
+                   }
 
-  /* If there are no entries in the symbol extension chain, then
-     there is no symbol extension section.  */
-  if (symext_root == NULL)
-    return;
+                 /* Determine what (if any) linker stub is needed.  */
+                 stub_type = hppa_type_of_stub (section, irela, hash,
+                                                destination);
+                 if (stub_type == hppa_stub_none)
+                   continue;
 
-  /* Count the number of entries on the chain.  */
-  for (n = 0, symextP = symext_root; symextP; symextP = symextP->next, ++n)
-    ;
+                 /* Support for grouping stub sections.  */
+                 id_sec = hplink->stub_group[section->id].link_sec;
 
-  /* 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;
+                 /* Get the name of this stub.  */
+                 stub_name = hppa_stub_name (id_sec, sym_sec, hash, irela);
+                 if (!stub_name)
+                   goto error_ret_free_internal;
 
-  /* 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 */
-    }
+                 stub_entry = hppa_stub_hash_lookup (&hplink->stub_hash_table,
+                                                     stub_name,
+                                                     false, false);
+                 if (stub_entry != NULL)
+                   {
+                     /* The proper stub has already been created.  */
+                     free (stub_name);
+                     continue;
+                   }
 
-  /* 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;
+                 stub_entry = hppa_add_stub (stub_name, section, hplink);
+                 if (stub_entry == NULL)
+                   {
+                     free (stub_name);
+                     goto error_ret_free_local;
+                   }
 
-  return;
-}
+                 stub_entry->target_value = sym_value;
+                 stub_entry->target_section = sym_sec;
+                 stub_entry->stub_type = stub_type;
+                 if (info->shared)
+                   {
+                     if (stub_type == hppa_stub_import)
+                       stub_entry->stub_type = hppa_stub_import_shared;
+                     else if (stub_type == hppa_stub_long_branch
+                              && (LONG_BRANCH_PIC_IN_SHLIB || hash == NULL))
+                       stub_entry->stub_type = hppa_stub_long_branch_shared;
+                   }
+                 stub_entry->h = hash;
+                 stub_changed = 1;
+               }
 
-/* Return the symbol extension record of type TYPE for the symbol SYM.  */
+             /* We're done with the internal relocs, free them.  */
+             free (internal_relocs);
+           }
+       }
 
-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:
+      if (!stub_changed)
+       break;
+
+      /* OK, we've added some stubs.  Find out the new size of the
+        stub sections.  */
+      for (stub_sec = hplink->stub_bfd->sections;
+          stub_sec != NULL;
+          stub_sec = stub_sec->next)
+       {
+         stub_sec->_raw_size = 0;
+         stub_sec->_cooked_size = 0;
+       }
+#if ! LONG_BRANCH_PIC_IN_SHLIB
       {
-       elf_symbol_type *esymP = (elf_symbol_type *) sym;
+       int i;
 
-       return (symext_entryS) esymP->tc_data.hppa_arg_reloc;
+       for (i = top_id; i >= 0; --i)
+         {
+           /* This will probably hit the same section many times..  */
+           stub_sec = hplink->stub_group[i].reloc_sec;
+           if (stub_sec != NULL)
+             {
+               stub_sec->_raw_size = 0;
+               stub_sec->_cooked_size = 0;
+             }
+         }
       }
-    /* 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.  */
+#endif
 
-static elf32_hppa_stub_description *
-find_stubs (abfd, stub_sec)
-     bfd *abfd;
-     asection *stub_sec;
-{
-  elf32_hppa_stub_description *stubP;
+      bfd_hash_traverse (&hplink->stub_hash_table,
+                        hppa_size_one_stub,
+                        hplink);
 
-  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;
+      /* Ask the linker to do its stuff.  */
+      (*hplink->layout_sections_again) ();
+      stub_changed = 0;
     }
-  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;
+  ret = 1;
 
-  /* 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 */
-    }
+ error_ret_free_local:
+  while (bfd_count-- > 0)
+    if (all_local_syms[bfd_count])
+      free (all_local_syms[bfd_count]);
+  free (all_local_syms);
 
-  return stub;
+  return ret;
 }
 
-/* Try and locate a stub with the name NAME within the stubs
-   associated with ABFD.  More linked list searches.  */
+/* For a final link, this function is called after we have sized the
+   stubs to provide a value for __gp.  */
 
-static elf32_hppa_stub_name_list *
-find_stub_by_name (abfd, stub_sec, name)
+boolean
+elf32_hppa_set_gp (abfd, info)
      bfd *abfd;
-     asection *stub_sec;
-     char *name;
+     struct bfd_link_info *info;
 {
-  /* Find the stubs associated with this bfd.  */
-  elf32_hppa_stub_description *stub = find_stubs (abfd, stub_sec);
-
-  /* If found, then we have to walk down them looking for a match.  */
-  if (stub)
+  struct elf32_hppa_link_hash_table *hplink;
+  struct elf_link_hash_entry *h;
+  asection *sec;
+  bfd_vma gp_val;
+
+  hplink = hppa_link_hash_table (info);
+  h = elf_link_hash_lookup (&hplink->root, "$global$",
+                           false, false, false);
+
+  if (h != NULL
+      && (h->root.type == bfd_link_hash_defined
+         || h->root.type == bfd_link_hash_defweak))
     {
-      elf32_hppa_stub_name_list *name_listP;
-
-      for (name_listP = stub->stub_listP;
-          name_listP;
-          name_listP = name_listP->next)
+      gp_val = h->root.u.def.value;
+      sec = h->root.u.def.section;
+    }
+  else
+    {
+      /* Choose to point our LTP at, in this order, one of .plt, .got,
+        or .data, if these sections exist.  In the case of choosing
+        .plt try to make the LTP ideal for addressing anywhere in the
+        .plt or .got with a 14 bit signed offset.  Typically, the end
+        of the .plt is the start of the .got, so choose .plt + 0x2000
+        if either the .plt or .got is larger than 0x2000.  If both
+        the .plt and .got are smaller than 0x2000, choose the end of
+        the .plt section.  */
+
+      sec = hplink->splt;
+      if (sec != NULL)
        {
-         if (!strcmp (name_listP->sym->name, name))
-           return name_listP;
+         gp_val = sec->_raw_size;
+         if (gp_val > 0x2000
+             || (hplink->sgot && hplink->sgot->_raw_size > 0x2000))
+           {
+             gp_val = 0x2000;
+           }
        }
-    }
-
-  /* Not found.  */
-  return 0;
-}
-
-/* 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;
-
-  /* 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);
-
-  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));
-
-      if (stub_entry)
-       {
-         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
+       {
+         gp_val = 0;
+         sec = hplink->sgot;
+         if (sec != NULL)
+           {
+             /* We know we don't have a .plt.  If .got is large,
+                offset our LTP.  */
+             if (sec->_raw_size > 0x2000)
+               gp_val = 0x2000;
+           }
          else
-           stub_entry->next = NULL;
-         stub->stub_listP = stub_entry;
-         return stub_entry;
+           {
+             /* No .plt or .got.  Who cares what the LTP is?  */
+             sec = bfd_get_section_by_name (abfd, ".data");
+           }
        }
-      else
+
+      if (h != NULL)
        {
-         bfd_set_error (bfd_error_no_memory);
-         abort();              /* FIXME */
+         h->root.type = bfd_link_hash_defined;
+         h->root.u.def.value = gp_val;
+         if (sec != NULL)
+           h->root.u.def.section = sec;
+         else
+           h->root.u.def.section = bfd_abs_section_ptr;
        }
     }
-  /* Death by mis-adventure.  */
-  abort ();
-  return (elf32_hppa_stub_name_list *)NULL;
+
+  if (sec != NULL && sec->output_section != NULL)
+    gp_val += sec->output_section->vma + sec->output_offset;
+
+  elf_gp (abfd) = gp_val;
+  return true;
 }
 
-/* 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.  */
+/* 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.  We also set up the .plt entries for statically linked PIC
+   functions here.  This function is called via hppaelf_finish in the
+   linker.  */
 
-static arg_reloc_type
-type_of_mismatch (caller_bits, callee_bits, type)
-     int caller_bits;
-     int callee_bits;
-     int type;
+boolean
+elf32_hppa_build_stubs (info)
+     struct bfd_link_info *info;
 {
-  switch (type)
+  asection *stub_sec;
+  struct bfd_hash_table *table;
+  struct elf32_hppa_link_hash_table *hplink;
+
+  hplink = hppa_link_hash_table (info);
+
+  for (stub_sec = hplink->stub_bfd->sections;
+       stub_sec != NULL;
+       stub_sec = stub_sec->next)
     {
-    case ARGUMENTS:
-      return mismatches[caller_bits][callee_bits];
-    case RETURN_VALUE:
-      return retval_mismatches[caller_bits][callee_bits];
+      bfd_size_type size;
+
+      /* Allocate memory to hold the linker stubs.  */
+      size = stub_sec->_raw_size;
+      stub_sec->contents = (unsigned char *) bfd_zalloc (hplink->stub_bfd,
+                                                        size);
+      if (stub_sec->contents == NULL && size != 0)
+       return false;
+      stub_sec->_raw_size = 0;
     }
-  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);  \
-}
+  /* Build the stubs as directed by the stub hash table.  */
+  table = &hplink->stub_hash_table;
+  bfd_hash_traverse (table, hppa_build_one_stub, info);
 
-/* 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)
+  return true;
+}
 
-/* All the stubs have already been built, finish up stub stuff
-   by applying relocations to the stubs.  */
+/* Perform a final link.  */
 
-static void
-hppa_elf_stub_finish (output_bfd)
-     bfd *output_bfd;
+static boolean
+elf32_hppa_final_link (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
 {
-  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)
+  asection *s;
+
+  /* Invoke the regular ELF linker to do all the work.  */
+  if (!bfd_elf32_bfd_final_link (abfd, info))
+    return false;
+
+  /* If we're producing a final executable, sort the contents of the
+     unwind section.  Magic section names, but this is much safer than
+     having elf32_hppa_relocate_section remember where SEGREL32 relocs
+     occurred.  Consider what happens if someone inept creates a
+     linker script that puts unwind information in .text.  */
+  s = bfd_get_section_by_name (abfd, ".PARISC.unwind");
+  if (s != NULL)
     {
-      /* 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");
-         bfd_size_type reloc_size;
-         arelent **reloc_vector;
+      bfd_size_type size;
+      char *contents;
 
-         /* Some sanity checking.  */
-         BFD_ASSERT (stub_sec == stub_list->stub_sec);
-         BFD_ASSERT (stub_sec);
+      size = s->_raw_size;
+      contents = bfd_malloc (size);
+      if (contents == NULL)
+       return false;
 
-         /* 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);
-         reloc_vector = (arelent **) alloca (reloc_size);
-
-         /* If we have relocations, do them.  */
-         if (bfd_canonicalize_reloc (stub_bfd, stub_sec, reloc_vector,
-                                     output_bfd->outsymbols))
-           {
-             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;
+      if (! bfd_get_section_contents (abfd, s, contents, (file_ptr) 0, size))
+       return false;
 
-                     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;
-                       }
-                   }
-               }
-           }
+      qsort (contents, (size_t) (size / 16), 16, hppa_unwind_entry_compare);
 
-         /* 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);
-       }
+      if (! bfd_set_section_contents (abfd, s, contents, (file_ptr) 0, size))
+       return false;
     }
-  /* All done.  */
-  stubs_finished = true;
+  return true;
 }
 
-/* Allocate a new relocation entry to be used in a linker stub.  */
+/* Record the lowest address for the data and text segments.  */
 
 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;
+hppa_record_segment_addr (abfd, section, data)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *section;
+     PTR data;
 {
-  arelent relent;
-  int size;
-  Elf_Internal_Shdr *rela_hdr;
+  struct elf32_hppa_link_hash_table *hplink;
+
+  hplink = (struct elf32_hppa_link_hash_table *) data;
 
-  /* I really don't like the realloc nonsense in here.  FIXME.  */
-  if (stub_desc->relocs_allocated_cnt == stub_desc->stub_sec->reloc_count)
+  if ((section->flags & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
     {
-      /* Allocate the first few relocation entries.  */
-      if (stub_desc->stub_sec->relocation == NULL)
+      bfd_vma value = section->vma - section->filepos;
+
+      if ((section->flags & SEC_READONLY) != 0)
        {
-         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);
+         if (value < hplink->text_segment_base)
+           hplink->text_segment_base = value;
        }
       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 */
+         if (value < hplink->data_segment_base)
+           hplink->data_segment_base = value;
        }
     }
-
-  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.  */
+/* Perform a relocation as part of a final link.  */
 
-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;
+static bfd_reloc_status_type
+final_link_relocate (input_section, contents, rel, value, hplink, sym_sec, h)
+     asection *input_section;
+     bfd_byte *contents;
+     const Elf_Internal_Rela *rel;
+     bfd_vma value;
+     struct elf32_hppa_link_hash_table *hplink;
+     asection *sym_sec;
+     struct elf32_hppa_link_hash_entry *h;
 {
-  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 *target_sym = reloc_entry->sym_ptr_ptr[0];
-  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];
+  int insn;
+  unsigned int r_type = ELF32_R_TYPE (rel->r_info);
+  reloc_howto_type *howto = elf_hppa_howto_table + r_type;
+  int r_format = howto->bitsize;
+  enum hppa_reloc_field_selector_type_alt r_field;
+  bfd *input_bfd = input_section->owner;
+  bfd_vma offset = rel->r_offset;
+  bfd_vma max_branch_offset = 0;
+  bfd_byte *hit_data = contents + offset;
+  bfd_signed_vma addend = rel->r_addend;
+  bfd_vma location;
+  struct elf32_hppa_stub_hash_entry *stub_entry = NULL;
+  int val;
+
+  if (r_type == R_PARISC_NONE)
+    return bfd_reloc_ok;
+
+  insn = bfd_get_32 (input_bfd, hit_data);
+
+  /* Find out where we are and where we're going.  */
+  location = (offset +
+             input_section->output_offset +
+             input_section->output_section->vma);
 
-      if (get_opcode (delay_insn) == LDO
-         && (((insn & 0x03e00000) >> 21) == ((delay_insn & 0x001f0000) >> 16)))
-       rtn_adjust = false;
-    }
-
-  /* Some special code for long-call stubs.  */
-  if (linker_stub_type == HPPA_STUB_LONG_CALL)
+  switch (r_type)
     {
-      
-      /* 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 (target_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 (target_sym->name, "_stub_", 6) == 0)
-         || (strncmp (target_sym->name, "_lb_stub_", 9) == 0))
+    case R_PARISC_PCREL12F:
+    case R_PARISC_PCREL17F:
+    case R_PARISC_PCREL22F:
+      /* If this is a call to a function defined in another dynamic
+        library, or if it is a call to a PIC function in the same
+        object, or if this is a shared link and it is a call to a
+        weak symbol which may or may not be in the same object, then
+        find the import stub in the stub hash.  */
+      if (sym_sec == NULL
+         || sym_sec->output_section == NULL
+         || (h != NULL
+             && ((h->maybe_pic_call
+                  && !(input_section->flags & SEC_HAS_GOT_REF))
+                 || (h->elf.root.type == bfd_link_hash_defweak
+                     && h->elf.dynindx != -1
+                     && h->elf.plt.offset != (bfd_vma) -1))))
        {
-         BFD_ASSERT (strcmp (target_sym->section->name, ".hppa_linker_stubs")
-                     == 0);
-         rtn_adjust = false;
+         stub_entry = hppa_get_stub_entry (input_section, sym_sec,
+                                           h, rel, hplink);
+         if (stub_entry != NULL)
+           {
+             value = (stub_entry->stub_offset
+                      + stub_entry->stub_sec->output_offset
+                      + stub_entry->stub_sec->output_section->vma);
+             addend = 0;
+           }
+         else if (sym_sec == NULL && h != NULL
+                  && h->elf.root.type == bfd_link_hash_undefweak)
+           {
+             /* It's OK if undefined weak.  Calls to undefined weak
+                symbols behave as if the "called" function
+                immediately returns.  We can thus call to a weak
+                function without first checking whether the function
+                is defined.  */
+             value = location;
+             addend = 8;
+           }
+         else
+           return bfd_reloc_notsupported;
        }
-    }
+      /* Fall thru.  */
+
+    case R_PARISC_PCREL21L:
+    case R_PARISC_PCREL17C:
+    case R_PARISC_PCREL17R:
+    case R_PARISC_PCREL14R:
+    case R_PARISC_PCREL14F:
+      /* Make it a pc relative offset.  */
+      value -= location;
+      addend -= 8;
+      break;
 
-  /* 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);
-    }
+    case R_PARISC_DPREL21L:
+    case R_PARISC_DPREL14R:
+    case R_PARISC_DPREL14F:
+    /* 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.  This situation commonly arises when a variable's "constness"
+       is declared differently from the way the variable is defined.  For
+       instance: "extern int foo" with foo defined as "const int foo".  */
+      if (sym_sec == NULL)
+       break;
+      if ((sym_sec->flags & SEC_CODE) != 0)
+       {
+         if ((insn & ((0x3f << 26) | (0x1f << 21)))
+             == (((int) OP_ADDIL << 26) | (27 << 21)))
+           {
+             insn &= ~ (0x1f << 21);
+#if 1 /* debug them.  */
+             (*_bfd_error_handler)
+               (_("%s(%s+0x%lx): fixing %s"),
+                bfd_get_filename (input_bfd),
+                input_section->name,
+                (long) rel->r_offset,
+                howto->name);
+#endif
+           }
+         /* Now try to make things easy for the dynamic linker.  */
 
-  /* Make the stub if we did not find one already.  */
-  if (!stub_desc)
-    stub_desc = new_stub (abfd, stub_sec, link_info);
+         break;
+       }
+      /* Fall thru.  */
 
-  /* 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);
-    }
+    case R_PARISC_DLTIND21L:
+    case R_PARISC_DLTIND14R:
+    case R_PARISC_DLTIND14F:
+      value -= elf_gp (input_section->output_section->owner);
+      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 ();
-    }
+    case R_PARISC_SEGREL32:
+      if ((sym_sec->flags & SEC_CODE) != 0)
+       value -= hplink->text_segment_base;
+      else
+       value -= hplink->data_segment_base;
+      break;
 
-  /* 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)
-    {
-      /* 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 = &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);
+    default:
+      break;
     }
-  else
+
+  switch (r_type)
     {
-      /* Create a new symbol to point to this stub.  */
-      stub_sym = bfd_make_empty_symbol (abfd);
-      if (!stub_sym)
+    case R_PARISC_DIR32:
+    case R_PARISC_DIR14F:
+    case R_PARISC_DIR17F:
+    case R_PARISC_PCREL17C:
+    case R_PARISC_PCREL14F:
+    case R_PARISC_DPREL14F:
+    case R_PARISC_PLABEL32:
+    case R_PARISC_DLTIND14F:
+    case R_PARISC_SEGBASE:
+    case R_PARISC_SEGREL32:
+      r_field = e_fsel;
+      break;
+
+    case R_PARISC_DIR21L:
+    case R_PARISC_PCREL21L:
+    case R_PARISC_DPREL21L:
+    case R_PARISC_PLABEL21L:
+    case R_PARISC_DLTIND21L:
+      r_field = e_lrsel;
+      break;
+
+    case R_PARISC_DIR17R:
+    case R_PARISC_PCREL17R:
+    case R_PARISC_DIR14R:
+    case R_PARISC_PCREL14R:
+    case R_PARISC_DPREL14R:
+    case R_PARISC_PLABEL14R:
+    case R_PARISC_DLTIND14R:
+      r_field = e_rrsel;
+      break;
+
+    case R_PARISC_PCREL12F:
+    case R_PARISC_PCREL17F:
+    case R_PARISC_PCREL22F:
+      r_field = e_fsel;
+
+      if (r_type == (unsigned int) R_PARISC_PCREL17F)
+       {
+         max_branch_offset = (1 << (17-1)) << 2;
+       }
+      else if (r_type == (unsigned int) R_PARISC_PCREL12F)
        {
-         bfd_set_error (bfd_error_no_memory);
-         abort ();
+         max_branch_offset = (1 << (12-1)) << 2;
        }
-      stub_sym->name = bfd_zalloc (abfd, strlen (stub_sym_name) + 1);
-      if (!stub_sym->name)
+      else
        {
-         bfd_set_error (bfd_error_no_memory);
-         abort ();
+         max_branch_offset = (1 << (22-1)) << 2;
        }
-      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 = &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);
+      /* sym_sec is NULL on undefined weak syms or when shared on
+        undefined syms.  We've already checked for a stub for the
+        shared undefined case.  */
+      if (sym_sec == NULL)
+       break;
 
-      /* Now generate the code for the stub.  Starting with two
-        common instructions.
+      /* If the branch is out of reach, then redirect the
+        call to the local stub for this function.  */
+      if (value + addend + max_branch_offset >= 2*max_branch_offset)
+       {
+         stub_entry = hppa_get_stub_entry (input_section, sym_sec,
+                                           h, rel, hplink);
+         if (stub_entry == NULL)
+           return bfd_reloc_notsupported;
+
+         /* Munge up the value and addend so that we call the stub
+            rather than the procedure directly.  */
+         value = (stub_entry->stub_offset
+                  + stub_entry->stub_sec->output_offset
+                  + stub_entry->stub_sec->output_section->vma
+                  - location);
+         addend = -8;
+       }
+      break;
 
-        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)
+    /* Something we don't know how to handle.  */
+    default:
+      return bfd_reloc_notsupported;
+    }
 
-      if (linker_stub_type == HPPA_STUB_ARG_RELOC)
-       {
-         NEW_INSTRUCTION (stub_entry, ADDI_8_SP)
+  /* Make sure we can reach the stub.  */
+  if (max_branch_offset != 0
+      && value + addend + max_branch_offset >= 2*max_branch_offset)
+    {
+      (*_bfd_error_handler)
+       (_("%s(%s+0x%lx): cannot reach %s, recompile with -ffunction-sections"),
+        bfd_get_filename (input_bfd),
+        input_section->name,
+        (long) rel->r_offset,
+        stub_entry->root.string);
+      return bfd_reloc_notsupported;
+    }
 
-         /* Examine each argument, generating code to relocate it
-            into a different register if necessary.  */
-           for (i = ARG0; i < ARG3; i++)
-             {
-               switch (stub_types[i])
-                 {
+  val = hppa_field_adjust (value, addend, r_field);
 
-                 case NO_ARG_RELOC:
-                   continue;
+  switch (r_type)
+    {
+    case R_PARISC_PCREL12F:
+    case R_PARISC_PCREL17C:
+    case R_PARISC_PCREL17F:
+    case R_PARISC_PCREL17R:
+    case R_PARISC_PCREL22F:
+    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.  */
+      val >>= 2;
+      break;
 
-                 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;
+    default:
+      break;
+    }
 
-                 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;
+  insn = hppa_rebuild_insn (insn, val, r_format);
 
-                 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;
+  /* Update the instruction word.  */
+  bfd_put_32 (input_bfd, (bfd_vma) insn, hit_data);
+  return bfd_reloc_ok;
+}
 
-                 default:
-                   abort ();
-                   break;
-                 }
-             }
+/* Relocate an HPPA ELF section.  */
 
-         /* Put the stack pointer back.  FIXME:  Is this still necessary?  */
-         NEW_INSTRUCTION (stub_entry, ADDI_M8_SP_SP)
+static boolean
+elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
+                            contents, relocs, local_syms, local_sections)
+     bfd *output_bfd;
+     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;
+{
+  bfd *dynobj;
+  bfd_vma *local_got_offsets;
+  struct elf32_hppa_link_hash_table *hplink;
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  asection *sreloc;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  hplink = hppa_link_hash_table (info);
+  dynobj = hplink->root.dynobj;
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+  sreloc = NULL;
+
+  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 elf32_hppa_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      asection *sym_sec;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *sym_name;
+      boolean plabel;
+      bfd_vma off;
+
+      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;
        }
+      if (r_type == (unsigned int) R_PARISC_GNU_VTENTRY
+         || r_type == (unsigned int) R_PARISC_GNU_VTINHERIT)
+       continue;
 
-      /* 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;
+               }
            }
+         continue;
        }
-      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)
-       }
-
-      /* 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, target_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, target_sym,
-                          CURRENT_STUB_OFFSET (stub_entry),
-                          R_HPPA_ABS_CALL_R17);
-
-      if (linker_stub_type == HPPA_STUB_ARG_RELOC)
-       {
-         /* 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)
-       }
-      else
+      /* This is a final link.  */
+      h = NULL;
+      sym = NULL;
+      sym_sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
        {
-         if (!dyncall)
-           {
-             /* 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)
-           }
-         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)
-           }
-
-         /* No need for a return to the main stream.  */
+         /* This is a local symbol, h defaults to NULL.  */
+         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);
        }
-    }
-  return stub_sym;
-}
-
-/* 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.  */
-
-static int
-hppa_elf_arg_reloc_needed_p (abfd, reloc_entry, stub_types, caller_ar)
-     bfd *abfd;
-     arelent *reloc_entry;
-     arg_reloc_type stub_types[5];
-     symext_entryS caller_ar;
-{
-  /* 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)
-    {
-      symext_entryS callee_ar = elf32_hppa_get_sym_extn (abfd,
-                                               reloc_entry->sym_ptr_ptr[0],
-                                                        HPPA_SXT_ARG_RELOC);
-
-      /* 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)
+      else
+       {
+         int indx;
+
+         /* It's a global; Find its entry in the link hash.  */
+         indx = r_symndx - symtab_hdr->sh_info;
+         h = ((struct elf32_hppa_link_hash_entry *)
+              elf_sym_hashes (input_bfd)[indx]);
+         while (h->elf.root.type == bfd_link_hash_indirect
+                || h->elf.root.type == bfd_link_hash_warning)
+           h = (struct elf32_hppa_link_hash_entry *) h->elf.root.u.i.link;
+
+         relocation = 0;
+         if (h->elf.root.type == bfd_link_hash_defined
+             || h->elf.root.type == bfd_link_hash_defweak)
            {
-             caller_loc[ARG0] = AR_DBL01;
-             caller_loc[ARG1] = AR_NO;
+             sym_sec = h->elf.root.u.def.section;
+             /* If sym_sec->output_section is NULL, then it's a
+                symbol defined in a shared library.  */
+             if (sym_sec->output_section != NULL)
+               relocation = (h->elf.root.u.def.value
+                             + sym_sec->output_offset
+                             + sym_sec->output_section->vma);
            }
-         if (caller_loc[ARG2] == AR_FU || caller_loc[ARG3] == AR_FU)
+         else if (h->elf.root.type == bfd_link_hash_undefweak)
+           ;
+         else if (info->shared && !info->no_undefined
+                  && ELF_ST_VISIBILITY (h->elf.other) == STV_DEFAULT
+                  && h->elf.type != STT_PARISC_MILLI)
            {
-             caller_loc[ARG2] = AR_DBL23;
-             caller_loc[ARG3] = AR_NO;
+             if (info->symbolic)
+               if (!((*info->callbacks->undefined_symbol)
+                     (info, h->elf.root.root.string, input_bfd,
+                      input_section, rel->r_offset, false)))
+                 return false;
            }
-         if (callee_loc[ARG0] == AR_FU || callee_loc[ARG1] == AR_FU)
+         else
            {
-             callee_loc[ARG0] = AR_DBL01;
-             callee_loc[ARG1] = AR_NO;
+             if (!((*info->callbacks->undefined_symbol)
+                   (info, h->elf.root.root.string, input_bfd,
+                    input_section, rel->r_offset, true)))
+               return false;
            }
-         if (callee_loc[ARG2] == AR_FU || callee_loc[ARG3] == AR_FU)
+       }
+
+      /* Do any required modifications to the relocation value, and
+        determine what types of dynamic info we need to output, if
+        any.  */
+      plabel = 0;
+      switch (r_type)
+       {
+       case R_PARISC_DLTIND14F:
+       case R_PARISC_DLTIND14R:
+       case R_PARISC_DLTIND21L:
+         /* Relocation is to the entry for this symbol in the global
+            offset table.  */
+         if (h != NULL)
            {
-             callee_loc[ARG2] = AR_DBL23;
-             callee_loc[ARG3] = AR_NO;
+             boolean dyn;
+
+             off = h->elf.got.offset;
+             dyn = hplink->root.dynamic_sections_created;
+             if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, &h->elf))
+               {
+                 /* This is actually a static link, or it is a
+                    -Bsymbolic link and the symbol is defined
+                    locally, or the symbol was forced to be local
+                    because of a version file.  We must initialize
+                    this entry in the global offset table.  Since the
+                    offset must always be a multiple of 4, we use the
+                    least significant bit to record whether we have
+                    initialized it already.
+
+                    When doing a dynamic link, we create a .rela.got
+                    relocation entry to initialize the value.  This
+                    is done in the finish_dynamic_symbol routine.  */
+                 if ((off & 1) != 0)
+                   off &= ~1;
+                 else
+                   {
+                     bfd_put_32 (output_bfd, relocation,
+                                 hplink->sgot->contents + off);
+                     h->elf.got.offset |= 1;
+                   }
+               }
            }
+         else
+           {
+             /* Local symbol case.  */
+             if (local_got_offsets == NULL)
+               abort ();
 
-         /* 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;
-       }
-    }
-  return 0;
-}
+             off = local_got_offsets[r_symndx];
+
+             /* The offset must always be a multiple of 4.  We use
+                the least significant bit to record whether we have
+                already generated the necessary reloc.  */
+             if ((off & 1) != 0)
+               off &= ~1;
+             else
+               {
+                 bfd_put_32 (output_bfd, relocation,
+                             hplink->sgot->contents + off);
 
-/* Create the linker stub section.  */
+                 if (info->shared)
+                   {
+                     /* Output a dynamic relocation for this GOT
+                        entry.  In this case it is relative to the
+                        base of the object because the symbol index
+                        is zero.  */
+                     Elf_Internal_Rela outrel;
+                     asection *srelgot = hplink->srelgot;
+
+                     outrel.r_offset = (off
+                                        + hplink->sgot->output_offset
+                                        + hplink->sgot->output_section->vma);
+                     outrel.r_info = ELF32_R_INFO (0, R_PARISC_DIR32);
+                     outrel.r_addend = relocation;
+                     bfd_elf32_swap_reloca_out (output_bfd, &outrel,
+                                                ((Elf32_External_Rela *)
+                                                 srelgot->contents
+                                                 + srelgot->reloc_count));
+                     ++srelgot->reloc_count;
+                   }
 
-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;
-{
-  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);
-}
+                 local_got_offsets[r_symndx] |= 1;
+               }
+           }
 
-/* Return nonzero if a long-call stub will be needed to call the
-   function (symbol in RELOC_ENTRY).  */
+         if (off >= (bfd_vma) -2)
+           abort ();
 
-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;
-{
-  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;
-    }  
-  return 0;
-}
+         /* Add the base of the GOT to the relocation value.  */
+         relocation = (off
+                       + hplink->sgot->output_offset
+                       + hplink->sgot->output_section->vma);
+         break;
+
+       case R_PARISC_SEGREL32:
+         /* If this is the first SEGREL relocation, then initialize
+            the segment base values.  */
+         if (hplink->text_segment_base == (bfd_vma) -1)
+           bfd_map_over_sections (output_bfd,
+                                  hppa_record_segment_addr,
+                                  hplink);
+         break;
 
-/* Search the given section and determine if linker stubs will be
-   needed for any calls within that section.
+       case R_PARISC_PLABEL14R:
+       case R_PARISC_PLABEL21L:
+       case R_PARISC_PLABEL32:
+         if (hplink->root.dynamic_sections_created)
+           {
+             /* If we have a global symbol with a PLT slot, then
+                redirect this relocation to it.  */
+             if (h != NULL)
+               {
+                 off = h->elf.plt.offset;
+                 if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, &h->elf))
+                   {
+                     /* In a non-shared link, adjust_dynamic_symbols
+                        isn't called for symbols forced local.  We
+                        need to write out the plt entry here.  */
+                     if ((off & 1) != 0)
+                       off &= ~1;
+                     else
+                       {
+                         bfd_put_32 (output_bfd,
+                                     relocation,
+                                     hplink->splt->contents + off);
+                         bfd_put_32 (output_bfd,
+                                     elf_gp (hplink->splt->output_section->owner),
+                                     hplink->splt->contents + off + 4);
+                         h->elf.plt.offset |= 1;
+                       }
+                   }
+               }
+             else
+               {
+                 bfd_vma *local_plt_offsets;
 
-   Return any new stub symbols created.
+                 if (local_got_offsets == NULL)
+                   abort ();
 
-   Used out of hppaelf.em in the linker.  */
-   
-asymbol *
-hppa_look_for_stubs_in_section (stub_bfd, abfd, output_bfd, asec,
-                               syms, new_sym_cnt, link_info)
-     bfd *stub_bfd;
-     bfd *abfd;
-     bfd *output_bfd;
-     asection *asec;
-     asymbol **syms;
-     int *new_sym_cnt;
-     struct bfd_link_info *link_info;
-{
-  int i;
-  arg_reloc_type stub_types[5];
-  asymbol *new_syms = NULL;
-  int new_cnt = 0;
-  int new_max = 0;
+                 local_plt_offsets = local_got_offsets + symtab_hdr->sh_info;
+                 off = local_plt_offsets[r_symndx];
 
-  /* 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)
-    {
-      arelent **reloc_vector
-       = (arelent **) alloca (asec->reloc_count * (sizeof (arelent *) + 1));
+                 /* As for the local .got entry case, we use the last
+                    bit to record whether we've already initialised
+                    this local .plt entry.  */
+                 if ((off & 1) != 0)
+                   off &= ~1;
+                 else
+                   {
+                     bfd_put_32 (output_bfd,
+                                 relocation,
+                                 hplink->splt->contents + off);
+                     bfd_put_32 (output_bfd,
+                                 elf_gp (hplink->splt->output_section->owner),
+                                 hplink->splt->contents + off + 4);
+
+                     if (info->shared)
+                       {
+                         /* Output a dynamic IPLT relocation for this
+                            PLT entry.  */
+                         Elf_Internal_Rela outrel;
+                         asection *srelplt = hplink->srelplt;
+
+                         outrel.r_offset = (off
+                                            + hplink->splt->output_offset
+                                            + hplink->splt->output_section->vma);
+                         outrel.r_info = ELF32_R_INFO (0, R_PARISC_IPLT);
+                         outrel.r_addend = relocation;
+                         bfd_elf32_swap_reloca_out (output_bfd, &outrel,
+                                                    ((Elf32_External_Rela *)
+                                                     srelplt->contents
+                                                     + srelplt->reloc_count));
+                         ++srelplt->reloc_count;
+                       }
 
-      bfd_canonicalize_reloc (abfd, asec, reloc_vector, syms);
+                     local_plt_offsets[r_symndx] |= 1;
+                   }
+               }
 
-      /* Examine each relocation entry in this section.  */
-      for (i = 0; i < asec->reloc_count; i++)
-       {
-         arelent *rle = reloc_vector[i];
+             if (off >= (bfd_vma) -2)
+               abort ();
 
-         switch (rle->howto->type)
+             /* PLABELs contain function pointers.  Relocation is to
+                the entry for the function in the .plt.  The magic +2
+                offset signals to $$dyncall that the function pointer
+                is in the .plt and thus has a gp pointer too.
+                Exception:  Undefined PLABELs should have a value of
+                zero.  */
+             if (h == NULL
+                 || (h->elf.root.type != bfd_link_hash_undefweak
+                     && h->elf.root.type != bfd_link_hash_undefined))
+               {
+                 relocation = (off
+                               + hplink->splt->output_offset
+                               + hplink->splt->output_section->vma
+                               + 2);
+               }
+             plabel = 1;
+           }
+         /* Fall through and possibly emit a dynamic relocation.  */
+
+       case R_PARISC_DIR17F:
+       case R_PARISC_DIR17R:
+       case R_PARISC_DIR14F:
+       case R_PARISC_DIR14R:
+       case R_PARISC_DIR21L:
+       case R_PARISC_DPREL14F:
+       case R_PARISC_DPREL14R:
+       case R_PARISC_DPREL21L:
+       case R_PARISC_DIR32:
+         /* The reloc types handled here and this conditional
+            expression must match the code in ..check_relocs and
+            ..discard_relocs.  ie. We need exactly the same condition
+            as in ..check_relocs, with some extra conditions (dynindx
+            test in this case) to cater for relocs removed by
+            ..discard_relocs.  If you squint, the non-shared test
+            here does indeed match the one in ..check_relocs, the
+            difference being that here we test DEF_DYNAMIC as well as
+            !DEF_REGULAR.  All common syms end up with !DEF_REGULAR,
+            which is why we can't use just that test here.
+            Conversely, DEF_DYNAMIC can't be used in check_relocs as
+            there all files have not been loaded.  */
+         if ((info->shared
+              && (input_section->flags & SEC_ALLOC) != 0
+              && (IS_ABSOLUTE_RELOC (r_type)
+                  || (h != NULL
+                      && h->elf.dynindx != -1
+                      && (!info->symbolic
+                          || (h->elf.elf_link_hash_flags
+                              & ELF_LINK_HASH_DEF_REGULAR) == 0))))
+             || (!info->shared
+                 && (input_section->flags & SEC_ALLOC) != 0
+                 && h != NULL
+                 && h->elf.dynindx != -1
+                 && (h->elf.elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
+                 && (((h->elf.elf_link_hash_flags
+                       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
+                      && (h->elf.elf_link_hash_flags
+                          & ELF_LINK_HASH_DEF_REGULAR) == 0)
+                     || h->elf.root.type == bfd_link_hash_undefweak
+                     || h->elf.root.type == bfd_link_hash_undefined)))
            {
-           /* 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)
-                         abort ();
-                     }
-
-                   /* 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)
-                         abort ();
-                     }
-
-                   /* 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;
+             Elf_Internal_Rela outrel;
+             boolean skip;
 
-           /* 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;
+             /* When generating a shared object, these relocations
+                are copied into the output file to be resolved at run
+                time.  */
 
-           default:
-             break;
+             if (sreloc == NULL)
+               {
+                 const char *name;
+
+                 name = (bfd_elf_string_from_elf_section
+                         (input_bfd,
+                          elf_elfheader (input_bfd)->e_shstrndx,
+                          elf_section_data (input_section)->rel_hdr.sh_name));
+                 if (name == NULL)
+                   return false;
+                 sreloc = bfd_get_section_by_name (dynobj, name);
+                 if (sreloc == NULL)
+                   abort ();
+               }
+
+             outrel.r_offset = rel->r_offset;
+             outrel.r_addend = rel->r_addend;
+             skip = false;
+             if (elf_section_data (input_section)->stab_info != NULL)
+               {
+                 off = (_bfd_stab_section_offset
+                        (output_bfd, &hplink->root.stab_info,
+                         input_section,
+                         &elf_section_data (input_section)->stab_info,
+                         rel->r_offset));
+                 if (off == (bfd_vma) -1)
+                   skip = true;
+                 outrel.r_offset = off;
+               }
+
+             outrel.r_offset += (input_section->output_offset
+                                 + input_section->output_section->vma);
+
+             if (skip)
+               {
+                 memset (&outrel, 0, sizeof (outrel));
+               }
+             else if (h != NULL
+                      && h->elf.dynindx != -1
+                      && (plabel
+                          || !IS_ABSOLUTE_RELOC (r_type)
+                          || !info->shared
+                          || !info->symbolic
+                          || (h->elf.elf_link_hash_flags
+                              & ELF_LINK_HASH_DEF_REGULAR) == 0))
+               {
+                 outrel.r_info = ELF32_R_INFO (h->elf.dynindx, r_type);
+               }
+             else /* It's a local symbol, or one marked to become local.  */
+               {
+                 int indx = 0;
+
+                 /* Add the absolute offset of the symbol.  */
+                 outrel.r_addend += relocation;
+
+                 /* Global plabels need to be processed by the
+                    dynamic linker so that functions have at most one
+                    fptr.  For this reason, we need to differentiate
+                    between global and local plabels, which we do by
+                    providing the function symbol for a global plabel
+                    reloc, and no symbol for local plabels.  */
+                 if (! plabel
+                     && sym_sec != NULL
+                     && sym_sec->output_section != NULL
+                     && ! bfd_is_abs_section (sym_sec))
+                   {
+                     indx = elf_section_data (sym_sec->output_section)->dynindx;
+                     /* We are turning this relocation into one
+                        against a section symbol, so subtract out the
+                        output section's address but not the offset
+                        of the input section in the output section.  */
+                     outrel.r_addend -= sym_sec->output_section->vma;
+                   }
+
+                 outrel.r_info = ELF32_R_INFO (indx, r_type);
+               }
+#if 0
+             /* EH info can cause unaligned DIR32 relocs.
+                Tweak the reloc type for the dynamic linker.  */
+             if (r_type == R_PARISC_DIR32 && (outrel.r_offset & 3) != 0)
+               outrel.r_info = ELF32_R_INFO (ELF32_R_SYM (outrel.r_info),
+                                             R_PARISC_DIR32U);
+#endif
+             bfd_elf32_swap_reloca_out (output_bfd, &outrel,
+                                        ((Elf32_External_Rela *)
+                                         sreloc->contents
+                                         + sreloc->reloc_count));
+             ++sreloc->reloc_count;
            }
+         break;
+
+       default:
+         break;
        }
-    }
 
-  /* Return the new symbols and update the counters.  */
-  *new_sym_cnt = new_cnt;
-  return new_syms;
-}
+      r = final_link_relocate (input_section, contents, rel, relocation,
+                              hplink, sym_sec, h);
 
-/* Set the contents of a particular section at a particular location.  */
+      if (r == bfd_reloc_ok)
+       continue;
 
-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;
-{
-  /* Linker stubs are handled a little differently.  */
-  if (! strcmp (section->name, ".hppa_linker_stubs"))
-    {
-      if (linker_stubs_max_size < offset + count)
+      if (h != NULL)
+       sym_name = h->elf.root.root.string;
+      else
        {
-         linker_stubs_max_size = offset + count + STUB_ALLOC_INCR;
-         linker_stubs = (char *)realloc (linker_stubs, linker_stubs_max_size);
-         if (! linker_stubs)
-           abort ();
+         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);
        }
 
-      if (offset + count > linker_stubs_size)
-       linker_stubs_size = offset + count;
-
-      /* 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);
-}
-
-/* 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.  */
+      howto = elf_hppa_howto_table + r_type;
 
-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;
-{
-  /* 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);
-    }
-
-  /* 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)
-    {
-      /* 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);
+      if (r == bfd_reloc_undefined || r == bfd_reloc_notsupported)
+       {
+         (*_bfd_error_handler)
+           (_("%s(%s+0x%lx): cannot handle %s for %s"),
+            bfd_get_filename (input_bfd),
+            input_section->name,
+            (long) rel->r_offset,
+            howto->name,
+            sym_name);
+       }
+      else
+       {
+         if (!((*info->callbacks->reloc_overflow)
+               (info, sym_name, howto->name, (bfd_vma) 0,
+                input_bfd, input_section, rel->r_offset)))
+           return false;
        }
-
-      /* 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);
     }
-  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.  */
-
-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)];
+  return true;
 }
 
-/* Do PA ELF specific processing for symbols.  Needed to find the
-   value of $global$.  */
+/* Comparison function for qsort to sort unwind section during a
+   final link.  */
 
-static void
-elf32_hppa_backend_symbol_processing (abfd, sym)
-     bfd *abfd;
-     asymbol *sym;
+static int
+hppa_unwind_entry_compare (a, b)
+     const PTR a;
+     const PTR b;
 {
-  /* 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;
-    }
+  const bfd_byte *ap, *bp;
+  unsigned long av, bv;
+
+  ap = (const bfd_byte *) a;
+  av = (unsigned long) ap[0] << 24;
+  av |= (unsigned long) ap[1] << 16;
+  av |= (unsigned long) ap[2] << 8;
+  av |= (unsigned long) ap[3];
+
+  bp = (const bfd_byte *) b;
+  bv = (unsigned long) bp[0] << 24;
+  bv |= (unsigned long) bp[1] << 16;
+  bv |= (unsigned long) bp[2] << 8;
+  bv |= (unsigned long) bp[3];
+
+  return av < bv ? -1 : av > bv ? 1 : 0;
 }
 
-/* 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.  */
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
 static boolean
-elf32_hppa_backend_symbol_table_processing (abfd, esyms,symcnt)
-     bfd *abfd;
-     elf_symbol_type *esyms;
-     int symcnt;
+elf32_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     struct elf_link_hash_entry *h;
+     Elf_Internal_Sym *sym;
 {
-  Elf32_Internal_Shdr *symextn_hdr =
-    bfd_elf_find_section (abfd, SYMEXTN_SECTION_NAME);
-  int i, current_sym_idx = 0;
+  struct elf32_hppa_link_hash_table *hplink;
+  bfd *dynobj;
 
-  /* If no symbol extension existed, then all symbol extension information
-     is assumed to be zero.  */
-  if (symextn_hdr == NULL)
-    {
-      for (i = 0; i < symcnt; i++)
-       esyms[i].tc_data.hppa_arg_reloc = 0;
-      return (true);
-    }
+  hplink = hppa_link_hash_table (info);
+  dynobj = hplink->root.dynobj;
 
-  /* 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)
-    {
-      bfd_set_error (bfd_error_system_call);
-      return (false);
-    }
-  if (bfd_read ((PTR) symextn_hdr->contents, 1, symextn_hdr->size, abfd) 
-      != symextn_hdr->size)
+  if (h->plt.offset != (bfd_vma) -1)
     {
-      bfd_set_error (bfd_error_system_call);
-      return (false);
-    }  
+      bfd_vma value;
 
-  /* 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++)
-    {
-      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);
+      if (h->plt.offset & 1)
+       abort ();
 
-      switch (se_type)
+      /* This symbol has an entry in the procedure linkage table.  Set
+        it up.
+
+        The format of a plt entry is
+        <funcaddr>
+        <__gp>
+      */
+      value = 0;
+      if (h->root.type == bfd_link_hash_defined
+         || h->root.type == bfd_link_hash_defweak)
        {
-       case HPPA_SXT_NULL:
-         break;
+         value = h->root.u.def.value;
+         if (h->root.u.def.section->output_section != NULL)
+           value += (h->root.u.def.section->output_offset
+                     + h->root.u.def.section->output_section->vma);
+       }
 
-       case HPPA_SXT_SYMNDX:
-         if (se_value >= symcnt)
+      if (! ((struct elf32_hppa_link_hash_entry *) h)->pic_call)
+       {
+         Elf_Internal_Rela rel;
+
+         /* Create a dynamic IPLT relocation for this entry.  */
+         rel.r_offset = (h->plt.offset
+                         + hplink->splt->output_offset
+                         + hplink->splt->output_section->vma);
+         if (! ((struct elf32_hppa_link_hash_entry *) h)->plt_abs
+             && h->dynindx != -1)
            {
-             bfd_set_error (bfd_error_bad_value);
-             return (false);
+             /* To support lazy linking, the function pointer is
+                initialised to point to a special stub stored at the
+                end of the .plt.  This is not done for plt entries
+                with a base-relative dynamic relocation.  */
+             value = (hplink->splt->output_offset
+                      + hplink->splt->output_section->vma
+                      + hplink->splt->_raw_size
+                      - sizeof (plt_stub)
+                      + PLT_STUB_ENTRY);
+             rel.r_info = ELF32_R_INFO (h->dynindx, R_PARISC_IPLT);
+             rel.r_addend = 0;
+           }
+         else
+           {
+             /* This symbol has been marked to become local, and is
+                used by a plabel so must be kept in the .plt.  */
+             rel.r_info = ELF32_R_INFO (0, R_PARISC_IPLT);
+             rel.r_addend = value;
            }
-         current_sym_idx = se_value - 1;
-         break;
-
-       case HPPA_SXT_ARG_RELOC:
-         esyms[current_sym_idx].tc_data.hppa_arg_reloc = se_value;
-         break;
 
-       default:
-         bfd_set_error (bfd_error_bad_value);
-         return (false);
+         bfd_elf32_swap_reloca_out (hplink->splt->output_section->owner,
+                                    &rel,
+                                    ((Elf32_External_Rela *)
+                                     hplink->srelplt->contents
+                                     + hplink->srelplt->reloc_count));
+         hplink->srelplt->reloc_count++;
        }
-    }
-  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.  */
+      bfd_put_32 (hplink->splt->owner,
+                 value,
+                 hplink->splt->contents + h->plt.offset);
+      bfd_put_32 (hplink->splt->owner,
+                 elf_gp (hplink->splt->output_section->owner),
+                 hplink->splt->contents + h->plt.offset + 4);
+      if (PLABEL_PLT_ENTRY_SIZE != PLT_ENTRY_SIZE
+         && ((struct elf32_hppa_link_hash_entry *) h)->plabel
+         && h->dynindx != -1)
+       {
+         memset (hplink->splt->contents + h->plt.offset + 8,
+                 0, PLABEL_PLT_ENTRY_SIZE - PLT_ENTRY_SIZE);
+       }
 
-static boolean
-elf32_hppa_backend_section_processing (abfd, secthdr)
-     bfd *abfd;
-     Elf32_Internal_Shdr *secthdr;
-{
-  int i, j, k;
+      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
+       {
+         /* Mark the symbol as undefined, rather than as defined in
+            the .plt section.  Leave the value alone.  */
+         sym->st_shndx = SHN_UNDEF;
+       }
+    }
 
-  if (secthdr->sh_type == SHT_HPPA_SYMEXTN)
+  if (h->got.offset != (bfd_vma) -1)
     {
-      for (i = 0; i < secthdr->size / sizeof (symext_entryS); i++)
+      Elf_Internal_Rela rel;
+
+      /* This symbol has an entry in the global offset table.  Set it
+        up.  */
+
+      rel.r_offset = ((h->got.offset &~ (bfd_vma) 1)
+                     + hplink->sgot->output_offset
+                     + hplink->sgot->output_section->vma);
+
+      /* If this is a -Bsymbolic link and the symbol is defined
+        locally or was forced to be local because of a version file,
+        we just want to emit a RELATIVE reloc.  The entry in the
+        global offset table will already have been initialized in the
+        relocate_section function.  */
+      if (info->shared
+         && (info->symbolic || h->dynindx == -1)
+         && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
        {
-         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)
-           {
-           case HPPA_SXT_NULL:
-             break;
-             
-           case HPPA_SXT_SYMNDX:
-             for (j = 0; j < abfd->symcount; j++)
-               {
-                 /* 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);
-                       }
-                   }
-               }
-             break;
-             
-           case HPPA_SXT_ARG_RELOC:
-             break;
-             
-           default:
-             bfd_set_error (bfd_error_bad_value);
-             return (false);
-           }
+         rel.r_info = ELF32_R_INFO (0, R_PARISC_DIR32);
+         rel.r_addend = (h->root.u.def.value
+                         + h->root.u.def.section->output_offset
+                         + h->root.u.def.section->output_section->vma);
+       }
+      else
+       {
+         if ((h->got.offset & 1) != 0)
+           abort ();
+         bfd_put_32 (output_bfd, (bfd_vma) 0,
+                     hplink->sgot->contents + h->got.offset);
+         rel.r_info = ELF32_R_INFO (h->dynindx, R_PARISC_DIR32);
+         rel.r_addend = 0;
        }
+
+      bfd_elf32_swap_reloca_out (output_bfd, &rel,
+                                ((Elf32_External_Rela *)
+                                 hplink->srelgot->contents
+                                 + hplink->srelgot->reloc_count));
+      ++hplink->srelgot->reloc_count;
+    }
+
+  if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
+    {
+      asection *s;
+      Elf_Internal_Rela rel;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+
+      if (! (h->dynindx != -1
+            && (h->root.type == bfd_link_hash_defined
+                || h->root.type == bfd_link_hash_defweak)))
+       abort ();
+
+      s = hplink->srelbss;
+
+      rel.r_offset = (h->root.u.def.value
+                     + h->root.u.def.section->output_offset
+                     + h->root.u.def.section->output_section->vma);
+      rel.r_addend = 0;
+      rel.r_info = ELF32_R_INFO (h->dynindx, R_PARISC_COPY);
+      bfd_elf32_swap_reloca_out (output_bfd, &rel,
+                                ((Elf32_External_Rela *) s->contents
+                                 + s->reloc_count));
+      ++s->reloc_count;
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (h->root.root.string[0] == '_'
+      && (strcmp (h->root.root.string, "_DYNAMIC") == 0
+         || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0))
+    {
+      sym->st_shndx = SHN_ABS;
     }
+
   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.  */
+/* Finish up the dynamic sections.  */
 
 static boolean
-elf32_hppa_backend_section_from_shdr (abfd, hdr, name)
-     bfd *abfd;
-     Elf32_Internal_Shdr *hdr;
-     char *name;
+elf32_hppa_finish_dynamic_sections (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
 {
-  asection *newsect;
+  bfd *dynobj;
+  struct elf32_hppa_link_hash_table *hplink;
+  asection *sdyn;
 
-  if (hdr->sh_type == SHT_HPPA_SYMEXTN)
+  hplink = hppa_link_hash_table (info);
+  dynobj = hplink->root.dynobj;
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (hplink->root.dynamic_sections_created)
     {
-      BFD_ASSERT (strcmp (name, ".hppa_symextn") == 0);
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      if (sdyn == NULL)
+       abort ();
 
-      /* Bits that get saved. This one is real.  */
-      if (!hdr->rawdata)
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
+      for (; dyncon < dynconend; dyncon++)
        {
-         newsect = bfd_make_section (abfd, name);
-         if (newsect != NULL)
+         Elf_Internal_Dyn dyn;
+         asection *s;
+
+         bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+         switch (dyn.d_tag)
            {
-             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;
+           default:
+             break;
 
-             if (hdr->sh_flags & SHF_ALLOC)
-               {
-                 newsect->flags |= SEC_ALLOC;
-                 newsect->flags |= SEC_LOAD;
-               }
+           case DT_PLTGOT:
+             /* Use PLTGOT to set the GOT register.  */
+             dyn.d_un.d_ptr = elf_gp (output_bfd);
+             bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+             break;
 
-             if (!(hdr->sh_flags & SHF_WRITE))
-               newsect->flags |= SEC_READONLY;
+           case DT_JMPREL:
+             s = hplink->srelplt;
+             dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+             bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+             break;
 
-             if (hdr->sh_flags & SHF_EXECINSTR)
-               newsect->flags |= SEC_CODE;
+           case DT_PLTRELSZ:
+             s = hplink->srelplt;
+             if (s->_cooked_size != 0)
+               dyn.d_un.d_val = s->_cooked_size;
              else
-               newsect->flags |= SEC_DATA;
-
-             hdr->rawdata = (void *) newsect;
+               dyn.d_un.d_val = s->_raw_size;
+             bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+             break;
            }
        }
-      return true;
     }
-  return false;
-}
 
-/* Return true if the given section is a fake section.  */
-
-static boolean
-elf32_hppa_backend_fake_sections (abfd, secthdr, asect)
-     bfd *abfd;
-     Elf_Internal_Shdr *secthdr;
-     asection *asect;
-{
-
-  if (strcmp(asect->name, ".hppa_symextn") == 0)
+  if (hplink->sgot != NULL && hplink->sgot->_raw_size != 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;
+      /* Fill in the first entry in the global offset table.
+        We use it to point to our dynamic section, if we have one.  */
+      bfd_put_32 (output_bfd,
+                 (sdyn != NULL
+                  ? sdyn->output_section->vma + sdyn->output_offset
+                  : (bfd_vma) 0),
+                 hplink->sgot->contents);
+
+      /* The second entry is reserved for use by the dynamic linker.  */
+      memset (hplink->sgot->contents + GOT_ENTRY_SIZE, 0, GOT_ENTRY_SIZE);
+
+      /* Set .got entry size.  */
+      elf_section_data (hplink->sgot->output_section)
+       ->this_hdr.sh_entsize = GOT_ENTRY_SIZE;
     }
 
-  if (!strcmp (asect->name, ".hppa_unwind"))
+  if (hplink->splt != NULL && hplink->splt->_raw_size != 0)
     {
-      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;
-    }
+      /* Set plt entry size.  */
+      elf_section_data (hplink->splt->output_section)
+       ->this_hdr.sh_entsize = PLT_ENTRY_SIZE;
 
-  /* @@ 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;
+      if (hplink->need_plt_stub)
+       {
+         /* Set up the .plt stub.  */
+         memcpy (hplink->splt->contents
+                 + hplink->splt->_raw_size - sizeof (plt_stub),
+                 plt_stub, sizeof (plt_stub));
+
+         if ((hplink->splt->output_offset
+              + hplink->splt->output_section->vma
+              + hplink->splt->_raw_size)
+             != (hplink->sgot->output_offset
+                 + hplink->sgot->output_section->vma))
+           {
+             (*_bfd_error_handler)
+               (_(".got section not immediately after .plt section"));
+             return false;
+           }
+       }
     }
 
-  return false;
+  return true;
 }
 
-/* Return true if there is a mapping from bfd section into a
-   backend section.  */
+/* Tweak the OSABI field of the elf header.  */
 
-static boolean
-elf32_hppa_backend_section_from_bfd_section (abfd, hdr, asect, ignored)
+static void
+elf32_hppa_post_process_headers (abfd, link_info)
      bfd *abfd;
-     Elf32_Internal_Shdr *hdr;
-     asection *asect;
-     int *ignored;
+     struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
 {
-  if (hdr->sh_type == SHT_HPPA_SYMEXTN)
+  Elf_Internal_Ehdr * i_ehdrp;
+
+  i_ehdrp = elf_elfheader (abfd);
+
+  if (strcmp (bfd_get_target (abfd), "elf32-hppa-linux") == 0)
     {
-      if (hdr->rawdata)
-       {
-         if (((struct sec *) (hdr->rawdata)) == asect)
-           {
-             BFD_ASSERT (strcmp (asect->name, ".hppa_symextn") == 0);
-             return true;
-           }
-       }
+      i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_LINUX;
     }
-  else if (hdr->sh_type == SHT_STRTAB)
+  else
     {
-      if (hdr->rawdata)
-       {
-         if (((struct sec *) (hdr->rawdata)) == asect)
-           {
-             BFD_ASSERT (strcmp (asect->name, ".stabstr") == 0);
-             return true;
-           }
-       }
+      i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_HPUX;
     }
-
-  return false;
 }
 
-#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
-
-#define elf_backend_symbol_processing  elf32_hppa_backend_symbol_processing
-#define elf_backend_symbol_table_processing    elf32_hppa_backend_symbol_table_processing
-
-#define bfd_generic_get_section_contents       hppa_elf_get_section_contents
-#define bfd_elf32_set_section_contents         hppa_elf_set_section_contents
-
-#define elf_backend_section_processing elf32_hppa_backend_section_processing
+/* Called when writing out an object file to decide the type of a
+   symbol.  */
+static int
+elf32_hppa_elf_get_symbol_type (elf_sym, type)
+     Elf_Internal_Sym *elf_sym;
+     int type;
+{
+  if (ELF_ST_TYPE (elf_sym->st_info) == STT_PARISC_MILLI)
+    return STT_PARISC_MILLI;
+  else
+    return type;
+}
 
-#define elf_backend_section_from_shdr  elf32_hppa_backend_section_from_shdr
-#define elf_backend_fake_sections      elf32_hppa_backend_fake_sections
+/* Misc BFD support code.  */
+#define bfd_elf32_bfd_is_local_label_name    elf_hppa_is_local_label_name
+#define bfd_elf32_bfd_reloc_type_lookup             elf_hppa_reloc_type_lookup
+#define elf_info_to_howto                   elf_hppa_info_to_howto
+#define elf_info_to_howto_rel               elf_hppa_info_to_howto_rel
+
+/* Stuff for the BFD linker.  */
+#define bfd_elf32_bfd_final_link            elf32_hppa_final_link
+#define bfd_elf32_bfd_link_hash_table_create elf32_hppa_link_hash_table_create
+#define elf_backend_add_symbol_hook         elf32_hppa_add_symbol_hook
+#define elf_backend_adjust_dynamic_symbol    elf32_hppa_adjust_dynamic_symbol
+#define elf_backend_check_relocs            elf32_hppa_check_relocs
+#define elf_backend_create_dynamic_sections  elf32_hppa_create_dynamic_sections
+#define elf_backend_fake_sections           elf_hppa_fake_sections
+#define elf_backend_relocate_section        elf32_hppa_relocate_section
+#define elf_backend_hide_symbol                     elf32_hppa_hide_symbol
+#define elf_backend_finish_dynamic_symbol    elf32_hppa_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections  elf32_hppa_finish_dynamic_sections
+#define elf_backend_size_dynamic_sections    elf32_hppa_size_dynamic_sections
+#define elf_backend_gc_mark_hook            elf32_hppa_gc_mark_hook
+#define elf_backend_gc_sweep_hook           elf32_hppa_gc_sweep_hook
+#define elf_backend_object_p                elf32_hppa_object_p
+#define elf_backend_final_write_processing   elf_hppa_final_write_processing
+#define elf_backend_post_process_headers     elf32_hppa_post_process_headers
+#define elf_backend_get_symbol_type         elf32_hppa_elf_get_symbol_type
+
+#define elf_backend_can_gc_sections         1
+#define elf_backend_plt_alignment           2
+#define elf_backend_want_got_plt            0
+#define elf_backend_plt_readonly            0
+#define elf_backend_want_plt_sym            0
+#define elf_backend_got_header_size         8
 
 #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"
+
+#undef TARGET_BIG_SYM
+#define TARGET_BIG_SYM                 bfd_elf32_hppa_linux_vec
+#undef TARGET_BIG_NAME
+#define TARGET_BIG_NAME                        "elf32-hppa-linux"
+
+#define INCLUDED_TARGET_FILE 1
+#include "elf32-target.h"
This page took 0.161579 seconds and 4 git commands to generate.