* elf-hppa.h (elf_hppa_final_link): Use elf_hppa_final_link.

	(elf_hppa_final_link_relocate ): Rewrite eliminating dynamic hash table.
	(elf_hppa_relocate_section): Likewise.
	* elf64-hppa.c (struct elf64_hppa_link_hash_entry): Change to derive
	from struct elf_link_hash_entry.  Add count field.
	(struct elf64_hppa_dyn_hash_table): Delete.
	(struct elf64_hppa_link_hash_table): Delete dyn_hash_table field.
	(elf64_hppa_hash_table): Rename to hppa_link_hash_table.
	(hppa_elf_hash_entry, eh_name): Define.
	(elf64_hppa_new_dyn_hash_entry): Delete.
	(elf64_hppa_dyn_hash_lookup): Delete.
	(elf64_hppa_dyn_hash_traverse): Delete.
	(get_dyn_name): Delete.
	(elf64_hppa_finalize_opd): Use struct elf_link_hash_entry * instead
	of struct elf64_hppa_dyn_hash_entry *.
	(elf64_hppa_finalize_dlt, llocate_global_data_dlt,
	allocate_global_data_plt, allocate_global_data_stub,
	allocate_global_data_opd, count_dyn_reloc, allocate_dynrel_entries):
	Likewise.
	(hppa64_link_hash_newfunc): New.
	(elf64_hppa_hash_table_create): Rework.
	(count_dyn_reloc): Likewise.
	(hppa64_elf_local_refcounts): New.
	(elf64_hppa_check_relocs): Rework using standard technique for recording
	local DLT, PLT and OPD reference counts.
	(elf64_hppa_dynamic_symbol_p): Revise using "eh" for struct
	elf_link_hash_entry *.
	(elf64_hppa_mark_exported_functions, allocate_global_data_dlt,
	allocate_global_data_plt, allocate_global_data_stub,
	allocate_global_data_opd, allocate_dynrel_entries,
	elf64_hppa_adjust_dynamic_symbol,
	elf64_hppa_mark_milli_and_exported_functions): Likewise.
	(elf64_hppa_create_dynamic_sections, elf64_hppa_size_dynamic_sections):
	Use hppa_link_hash_table.  Rework.
	(elf64_hppa_link_output_symbol_hook): Rework.
	(elf64_hppa_finish_dynamic_symbol, elf64_hppa_finalize_opd,
	elf64_hppa_finalize_dlt, elf64_hppa_finalize_dynreloc,
	elf64_hppa_finish_dynamic_sections): Likewise.

1 files changed, 538 insertions, 473 deletions

diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c
index b414779..d03b298 100644
--- a/bfd/elf64-hppa.c
+++ b/bfd/elf64-hppa.c
@@ -1,5 +1,5 @@
 /* Support for HPPA 64-bit ELF
-   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -74,9 +74,9 @@ extern void *alloca (size_t);
 static char plt_stub[] = {0x53, 0x61, 0x00, 0x00, 0xe8, 0x20, 0xd0, 0x00,
 			  0x53, 0x7b, 0x00, 0x00 };
 
-struct elf64_hppa_dyn_hash_entry
+struct elf64_hppa_link_hash_entry
 {
-  struct bfd_hash_entry root;
+  struct elf_link_hash_entry eh;
 
   /* Offsets for this symbol in various linker sections.  */
   bfd_vma dlt_offset;
@@ -84,9 +84,6 @@ struct elf64_hppa_dyn_hash_entry
   bfd_vma opd_offset;
   bfd_vma stub_offset;
 
-  /* The symbol table entry, if any, that this was derived from.  */
-  struct elf_link_hash_entry *h;
-
   /* The index of the (possibly local) symbol in the input bfd and its
      associated BFD.  Needed so that we can have relocs against local
      symbols in shared libraries.  */
@@ -115,6 +112,9 @@ struct elf64_hppa_dyn_hash_entry
     /* The input section of the relocation.  */
     asection *sec;
 
+    /* Number of relocs copied in this section.  */
+    bfd_size_type count;
+
     /* The index of the section symbol for the input section of
        the relocation.  Only needed when building shared libraries.  */
     int sec_symndx;
@@ -135,11 +135,6 @@ struct elf64_hppa_dyn_hash_entry
   unsigned want_stub;
 };
 
-struct elf64_hppa_dyn_hash_table
-{
-  struct bfd_hash_table root;
-};
-
 struct elf64_hppa_link_hash_table
 {
   struct elf_link_hash_table root;
@@ -166,8 +161,6 @@ struct elf64_hppa_link_hash_table
   bfd_vma text_segment_base;
   bfd_vma data_segment_base;
 
-  struct elf64_hppa_dyn_hash_table dyn_hash_table;
-
   /* We build tables to map from an input section back to its
      symbol index.  This is the BFD for which we currently have
      a map.  */
@@ -178,32 +171,21 @@ struct elf64_hppa_link_hash_table
   int *section_syms;
 };
 
-#define elf64_hppa_hash_table(p) \
+#define hppa_link_hash_table(p) \
   ((struct elf64_hppa_link_hash_table *) ((p)->hash))
 
+#define hppa_elf_hash_entry(ent) \
+  ((struct elf64_hppa_link_hash_entry *)(ent))
+
+#define eh_name(eh) \
+  (eh ? eh->root.root.string : "<undef>")
+
 typedef struct bfd_hash_entry *(*new_hash_entry_func)
   (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
 
-static struct bfd_hash_entry *elf64_hppa_new_dyn_hash_entry
-  (struct bfd_hash_entry *entry, struct bfd_hash_table *table,
-   const char *string);
-
 static struct bfd_link_hash_table *elf64_hppa_hash_table_create
   (bfd *abfd);
 
-static struct elf64_hppa_dyn_hash_entry *elf64_hppa_dyn_hash_lookup
-  (struct elf64_hppa_dyn_hash_table *table, const char *string,
-   bfd_boolean create, bfd_boolean copy);
-
-static void elf64_hppa_dyn_hash_traverse
-  (struct elf64_hppa_dyn_hash_table *table,
-   bfd_boolean (*func) (struct elf64_hppa_dyn_hash_entry *, void *),
-   void *info);
-
-static const char *get_dyn_name
-  (bfd *, struct elf_link_hash_entry *,
-   const Elf_Internal_Rela *, char **, size_t *);
-
 /* This must follow the definitions of the various derived linker
    hash tables and shared functions.  */
 #include "elf-hppa.h"
@@ -251,35 +233,35 @@ static bfd_boolean elf64_hppa_mark_exported_functions
   (struct elf_link_hash_entry *, void *);
 
 static bfd_boolean elf64_hppa_finalize_opd
-  (struct elf64_hppa_dyn_hash_entry *, void *);
+  (struct elf_link_hash_entry *, void *);
 
 static bfd_boolean elf64_hppa_finalize_dlt
-  (struct elf64_hppa_dyn_hash_entry *, void *);
+  (struct elf_link_hash_entry *, void *);
 
 static bfd_boolean allocate_global_data_dlt
-  (struct elf64_hppa_dyn_hash_entry *, void *);
+  (struct elf_link_hash_entry *, void *);
 
 static bfd_boolean allocate_global_data_plt
-  (struct elf64_hppa_dyn_hash_entry *, void *);
+  (struct elf_link_hash_entry *, void *);
 
 static bfd_boolean allocate_global_data_stub
-  (struct elf64_hppa_dyn_hash_entry *, void *);
+  (struct elf_link_hash_entry *, void *);
 
 static bfd_boolean allocate_global_data_opd
-  (struct elf64_hppa_dyn_hash_entry *, void *);
+  (struct elf_link_hash_entry *, void *);
 
 static bfd_boolean get_reloc_section
   (bfd *, struct elf64_hppa_link_hash_table *, asection *);
 
 static bfd_boolean count_dyn_reloc
-  (bfd *, struct elf64_hppa_dyn_hash_entry *,
+  (bfd *, struct elf64_hppa_link_hash_entry *,
    int, asection *, int, bfd_vma, bfd_vma);
 
 static bfd_boolean allocate_dynrel_entries
-  (struct elf64_hppa_dyn_hash_entry *, void *);
+  (struct elf_link_hash_entry *, void *);
 
 static bfd_boolean elf64_hppa_finalize_dynreloc
-  (struct elf64_hppa_dyn_hash_entry *, void *);
+  (struct elf_link_hash_entry *, void *);
 
 static bfd_boolean get_opd
   (bfd *, struct bfd_link_info *, struct elf64_hppa_link_hash_table *);
@@ -296,42 +278,37 @@ static bfd_boolean get_stub
 static int elf64_hppa_elf_get_symbol_type
   (Elf_Internal_Sym *, int);
 
-static bfd_boolean
-elf64_hppa_dyn_hash_table_init (struct elf64_hppa_dyn_hash_table *ht,
-				bfd *abfd ATTRIBUTE_UNUSED,
-				new_hash_entry_func new,
-				unsigned int entsize)
-{
-  memset (ht, 0, sizeof (*ht));
-  return bfd_hash_table_init (&ht->root, new, entsize);
-}
+/* Initialize an entry in the link hash table.  */
 
-static struct bfd_hash_entry*
-elf64_hppa_new_dyn_hash_entry (struct bfd_hash_entry *entry,
-			       struct bfd_hash_table *table,
-			       const char *string)
+static struct bfd_hash_entry *
+hppa64_link_hash_newfunc (struct bfd_hash_entry *entry,
+			  struct bfd_hash_table *table,
+			  const char *string)
 {
-  struct elf64_hppa_dyn_hash_entry *ret;
-  ret = (struct elf64_hppa_dyn_hash_entry *) entry;
-
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
-  if (!ret)
-    ret = bfd_hash_allocate (table, sizeof (*ret));
-
-  if (!ret)
-    return 0;
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf64_hppa_link_hash_entry));
+      if (entry == NULL)
+        return entry;
+    }
 
   /* Call the allocation method of the superclass.  */
-  ret = ((struct elf64_hppa_dyn_hash_entry *)
-	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf64_hppa_link_hash_entry *hh;
 
-  /* Initialize our local data.  All zeros.  */
-  memset (&ret->dlt_offset, 0,
-	  (sizeof (struct elf64_hppa_dyn_hash_entry)
-	   - offsetof (struct elf64_hppa_dyn_hash_entry, dlt_offset)));
+      /* Initialize our local data.  All zeros.  */
+      hh = hppa_elf_hash_entry (entry);
+      memset (&hh->dlt_offset, 0,
+	      (sizeof (struct elf64_hppa_link_hash_entry)
+	       - offsetof (struct elf64_hppa_link_hash_entry, dlt_offset)));
+    }
 
-  return &ret->root;
+  return entry;
 }
 
 /* Create the derived linker hash table.  The PA64 ELF port uses this
@@ -341,48 +318,25 @@ elf64_hppa_new_dyn_hash_entry (struct bfd_hash_entry *entry,
 static struct bfd_link_hash_table*
 elf64_hppa_hash_table_create (bfd *abfd)
 {
-  struct elf64_hppa_link_hash_table *ret;
-
-  ret = bfd_zalloc (abfd, (bfd_size_type) sizeof (*ret));
-  if (!ret)
-    return 0;
-  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
-				      _bfd_elf_link_hash_newfunc,
-				      sizeof (struct elf_link_hash_entry)))
-    {
-      bfd_release (abfd, ret);
-      return 0;
-    }
-
-  if (!elf64_hppa_dyn_hash_table_init (&ret->dyn_hash_table, abfd,
-				       elf64_hppa_new_dyn_hash_entry,
-				       sizeof (struct elf64_hppa_dyn_hash_entry)))
-    return 0;
-  return &ret->root.root;
-}
+  struct elf64_hppa_link_hash_table *htab;
+  bfd_size_type amt = sizeof (*htab);
 
-/* Look up an entry in a PA64 ELF linker hash table.  */
+  htab = bfd_zalloc (abfd, amt);
+  if (htab == NULL)
+    return NULL;
 
-static struct elf64_hppa_dyn_hash_entry *
-elf64_hppa_dyn_hash_lookup(struct elf64_hppa_dyn_hash_table *table,
-			   const char *string,
-			   bfd_boolean create,
-			   bfd_boolean copy)
-{
-  return ((struct elf64_hppa_dyn_hash_entry *)
-	  bfd_hash_lookup (&table->root, string, create, copy));
-}
+  if (!_bfd_elf_link_hash_table_init (&htab->root, abfd,
+				      hppa64_link_hash_newfunc,
+				      sizeof (struct elf64_hppa_link_hash_entry)))
+    {
+      bfd_release (abfd, htab);
+      return NULL;
+    }
 
-/* Traverse a PA64 ELF linker hash table.  */
+  htab->text_segment_base = (bfd_vma) -1;
+  htab->data_segment_base = (bfd_vma) -1;
 
-static void
-elf64_hppa_dyn_hash_traverse (struct elf64_hppa_dyn_hash_table *table,
-	bfd_boolean (*func) (struct elf64_hppa_dyn_hash_entry *, void *),
-        void *info)
-{
-  bfd_hash_traverse (&table->root,
-		     (bfd_boolean (*) (struct bfd_hash_entry *, void *)) func,
-		     info);
+  return &htab->root.root;
 }
 
 /* Return nonzero if ABFD represents a PA2.0 ELF64 file.
@@ -464,64 +418,6 @@ elf64_hppa_section_from_shdr (bfd *abfd,
   return TRUE;
 }
 
-/* Construct a string for use in the elf64_hppa_dyn_hash_table.  The
-   name describes what was once potentially anonymous memory.  We
-   allocate memory as necessary, possibly reusing PBUF/PLEN.  */
-
-static const char *
-get_dyn_name (bfd *abfd,
-	      struct elf_link_hash_entry *h,
-	      const Elf_Internal_Rela *rel,
-	      char **pbuf,
-	      size_t *plen)
-{
-  asection *sec = abfd->sections;
-  size_t nlen, tlen;
-  char *buf;
-  size_t len;
-
-  if (h && rel->r_addend == 0)
-    return h->root.root.string;
-
-  if (h)
-    nlen = strlen (h->root.root.string);
-  else
-    nlen = 8 + 1 + sizeof (rel->r_info) * 2 - 8;
-  tlen = nlen + 1 + sizeof (rel->r_addend) * 2 + 1;
-
-  len = *plen;
-  buf = *pbuf;
-  if (len < tlen)
-    {
-      if (buf)
-	free (buf);
-      *pbuf = buf = malloc (tlen);
-      *plen = len = tlen;
-      if (!buf)
-	return NULL;
-    }
-
-  if (h)
-    {
-      memcpy (buf, h->root.root.string, nlen);
-      buf[nlen++] = '+';
-      sprintf_vma (buf + nlen, rel->r_addend);
-    }
-  else
-    {
-      nlen = sprintf (buf, "%x:%lx",
-		      sec->id & 0xffffffff,
-		      (unsigned long) ELF64_R_SYM (rel->r_info));
-      if (rel->r_addend)
-	{
-	  buf[nlen++] = '+';
-	  sprintf_vma (buf + nlen, rel->r_addend);
-	}
-    }
-
-  return buf;
-}
-
 /* SEC is a section containing relocs for an input BFD when linking; return
    a suitable section for holding relocs in the output BFD for a link.  */
 
@@ -578,7 +474,7 @@ get_reloc_section (bfd *abfd,
 
 static bfd_boolean
 count_dyn_reloc (bfd *abfd,
-		 struct elf64_hppa_dyn_hash_entry *dyn_h,
+		 struct elf64_hppa_link_hash_entry *hh,
 		 int type,
 		 asection *sec,
 	         int sec_symndx,
@@ -592,17 +488,42 @@ count_dyn_reloc (bfd *abfd,
   if (!rent)
     return FALSE;
 
-  rent->next = dyn_h->reloc_entries;
+  rent->next = hh->reloc_entries;
   rent->type = type;
   rent->sec = sec;
   rent->sec_symndx = sec_symndx;
   rent->offset = offset;
   rent->addend = addend;
-  dyn_h->reloc_entries = rent;
+  hh->reloc_entries = rent;
 
   return TRUE;
 }
 
+/* Return a pointer to the local DLT, PLT and OPD reference counts
+   for ABFD.  Returns NULL if the storage allocation fails.  */
+
+static bfd_signed_vma *
+hppa64_elf_local_refcounts (bfd *abfd)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  bfd_signed_vma *local_refcounts;
+                  
+  local_refcounts = elf_local_got_refcounts (abfd);
+  if (local_refcounts == NULL)
+    {
+      bfd_size_type size;
+
+      /* Allocate space for local DLT, PLT and OPD reference
+	 counts.  Done this way to save polluting elf_obj_tdata
+	 with another target specific pointer.  */
+      size = symtab_hdr->sh_info;
+      size *= 3 * sizeof (bfd_signed_vma);
+      local_refcounts = bfd_zalloc (abfd, size);
+      elf_local_got_refcounts (abfd) = local_refcounts;
+    }
+  return local_refcounts;
+}
+
 /* Scan the RELOCS and record the type of dynamic entries that each
    referenced symbol needs.  */
 
@@ -632,7 +553,7 @@ elf64_hppa_check_relocs (bfd *abfd,
 	return FALSE;
     }
 
-  hppa_info = elf64_hppa_hash_table (info);
+  hppa_info = hppa_link_hash_table (info);
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
 
   /* If necessary, build a new table holding section symbols indices
@@ -745,11 +666,9 @@ elf64_hppa_check_relocs (bfd *abfd,
 	  NEED_DYNREL = 16,
 	};
 
-      struct elf_link_hash_entry *h = NULL;
       unsigned long r_symndx = ELF64_R_SYM (rel->r_info);
-      struct elf64_hppa_dyn_hash_entry *dyn_h;
+      struct elf64_hppa_link_hash_entry *hh;
       int need_entry;
-      const char *addr_name;
       bfd_boolean maybe_dynamic;
       int dynrel_type = R_PARISC_NONE;
       static reloc_howto_type *howto;
@@ -759,24 +678,26 @@ elf64_hppa_check_relocs (bfd *abfd,
 	  /* We're dealing with a global symbol -- find its hash entry
 	     and mark it as being referenced.  */
 	  long indx = r_symndx - symtab_hdr->sh_info;
-	  h = elf_sym_hashes (abfd)[indx];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  hh = hppa_elf_hash_entry (elf_sym_hashes (abfd)[indx]);
+	  while (hh->eh.root.type == bfd_link_hash_indirect
+		 || hh->eh.root.type == bfd_link_hash_warning)
+	    hh = hppa_elf_hash_entry (hh->eh.root.u.i.link);
 
-	  h->ref_regular = 1;
+	  hh->eh.ref_regular = 1;
 	}
+      else
+	hh = NULL;
 
       /* We can only get preliminary data on whether a symbol is
 	 locally or externally defined, as not all of the input files
 	 have yet been processed.  Do something with what we know, as
 	 this may help reduce memory usage and processing time later.  */
       maybe_dynamic = FALSE;
-      if (h && ((info->shared
+      if (hh && ((info->shared
 		 && (!info->symbolic
 		     || info->unresolved_syms_in_shared_libs == RM_IGNORE))
-		|| !h->def_regular
-		|| h->root.type == bfd_link_hash_defweak))
+		|| !hh->eh.def_regular
+		|| hh->eh.root.type == bfd_link_hash_defweak))
 	maybe_dynamic = TRUE;
 
       howto = elf_hppa_howto_table + ELF64_R_TYPE (rel->r_info);
@@ -827,7 +748,12 @@ elf64_hppa_check_relocs (bfd *abfd,
 	case R_PARISC_PCREL16F:
 	case R_PARISC_PCREL16WF:
 	case R_PARISC_PCREL16DF:
-	  need_entry = (NEED_PLT | NEED_STUB);
+	  /* Function calls might need to go through the .plt, and
+	     might need a long branch stub.  */
+	  if (hh != NULL && hh->eh.type != STT_PARISC_MILLI)
+	    need_entry = (NEED_PLT | NEED_STUB);
+	  else
+	    need_entry = 0;
 	  break;
 
 	case R_PARISC_PLTOFF21L:
@@ -860,18 +786,18 @@ elf64_hppa_check_relocs (bfd *abfd,
 	case R_PARISC_LTOFF_FPTR16WF:
 	case R_PARISC_LTOFF_FPTR16DF:
 	  if (info->shared || maybe_dynamic)
-	    need_entry = (NEED_DLT | NEED_OPD);
+	    need_entry = (NEED_DLT | NEED_OPD | NEED_PLT);
 	  else
-	    need_entry = (NEED_DLT | NEED_OPD);
+	    need_entry = (NEED_DLT | NEED_OPD | NEED_PLT);
 	  dynrel_type = R_PARISC_FPTR64;
 	  break;
 
 	/* This is a simple OPD entry.  */
 	case R_PARISC_FPTR64:
 	  if (info->shared || maybe_dynamic)
-	    need_entry = (NEED_OPD | NEED_DYNREL);
+	    need_entry = (NEED_OPD | NEED_PLT | NEED_DYNREL);
 	  else
-	    need_entry = (NEED_OPD);
+	    need_entry = (NEED_OPD | NEED_PLT);
 	  dynrel_type = R_PARISC_FPTR64;
 	  break;
 
@@ -881,28 +807,38 @@ elf64_hppa_check_relocs (bfd *abfd,
       if (!need_entry)
 	continue;
 
-      /* Collect a canonical name for this address.  */
-      addr_name = get_dyn_name (abfd, h, rel, &buf, &buf_len);
-
-      /* Collect the canonical entry data for this address.  */
-      dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
-					  addr_name, TRUE, TRUE);
-      BFD_ASSERT (dyn_h);
-
-      /* Stash away enough information to be able to find this symbol
-	 regardless of whether or not it is local or global.  */
-      dyn_h->h = h;
-      dyn_h->owner = abfd;
-      dyn_h->sym_indx = r_symndx;
+      if (hh)
+	{
+	  /* Stash away enough information to be able to find this symbol
+	     regardless of whether or not it is local or global.  */
+	  hh->owner = abfd;
+	  hh->sym_indx = r_symndx;
+	}
 
-      /* ?!? We may need to do some error checking in here.  */
       /* Create what's needed.  */
       if (need_entry & NEED_DLT)
 	{
+	  /* Allocate space for a DLT entry, as well as a dynamic
+	     relocation for this entry.  */
 	  if (! hppa_info->dlt_sec
 	      && ! get_dlt (abfd, info, hppa_info))
 	    goto err_out;
-	  dyn_h->want_dlt = 1;
+
+	  if (hh != NULL)
+	    {
+	      hh->want_dlt = 1;
+	      hh->eh.got.refcount += 1;
+	    }
+	  else
+	    {
+	      bfd_signed_vma *local_dlt_refcounts;
+                  
+	      /* This is a DLT entry for a local symbol.  */
+	      local_dlt_refcounts = hppa64_elf_local_refcounts (abfd);
+	      if (local_dlt_refcounts == NULL)
+		return FALSE;
+	      local_dlt_refcounts[r_symndx] += 1;
+	    }
 	}
 
       if (need_entry & NEED_PLT)
@@ -910,7 +846,25 @@ elf64_hppa_check_relocs (bfd *abfd,
 	  if (! hppa_info->plt_sec
 	      && ! get_plt (abfd, info, hppa_info))
 	    goto err_out;
-	  dyn_h->want_plt = 1;
+
+	  if (hh != NULL)
+	    {
+	      hh->want_plt = 1;
+	      hh->eh.needs_plt = 1;
+	      hh->eh.plt.refcount += 1;
+	    }
+	  else
+	    {
+	      bfd_signed_vma *local_dlt_refcounts;
+	      bfd_signed_vma *local_plt_refcounts;
+                  
+	      /* This is a PLT entry for a local symbol.  */
+	      local_dlt_refcounts = hppa64_elf_local_refcounts (abfd);
+	      if (local_dlt_refcounts == NULL)
+		return FALSE;
+	      local_plt_refcounts = local_dlt_refcounts + symtab_hdr->sh_info;
+	      local_plt_refcounts[r_symndx] += 1;
+	    }
 	}
 
       if (need_entry & NEED_STUB)
@@ -918,7 +872,8 @@ elf64_hppa_check_relocs (bfd *abfd,
 	  if (! hppa_info->stub_sec
 	      && ! get_stub (abfd, info, hppa_info))
 	    goto err_out;
-	  dyn_h->want_stub = 1;
+	  if (hh)
+	    hh->want_stub = 1;
 	}
 
       if (need_entry & NEED_OPD)
@@ -927,15 +882,24 @@ elf64_hppa_check_relocs (bfd *abfd,
 	      && ! get_opd (abfd, info, hppa_info))
 	    goto err_out;
 
-	  dyn_h->want_opd = 1;
-
-	  /* FPTRs are not allocated by the dynamic linker for PA64, though
-	     it is possible that will change in the future.  */
+	  /* FPTRs are not allocated by the dynamic linker for PA64,
+	     though it is possible that will change in the future.  */
 
-	  /* This could be a local function that had its address taken, in
-	     which case H will be NULL.  */
-	  if (h)
-	    h->needs_plt = 1;
+	  if (hh != NULL)
+	    hh->want_opd = 1;
+	  else
+	    {
+	      bfd_signed_vma *local_dlt_refcounts;
+	      bfd_signed_vma *local_opd_refcounts;
+                  
+	      /* This is a OPD for a local symbol.  */
+	      local_dlt_refcounts = hppa64_elf_local_refcounts (abfd);
+	      if (local_dlt_refcounts == NULL)
+		return FALSE;
+	      local_opd_refcounts = (local_dlt_refcounts
+				     + 2 * symtab_hdr->sh_info);
+	      local_opd_refcounts[r_symndx] += 1;
+	    }
 	}
 
       /* Add a new dynamic relocation to the chain of dynamic
@@ -946,8 +910,10 @@ elf64_hppa_check_relocs (bfd *abfd,
 	      && ! get_reloc_section (abfd, hppa_info, sec))
 	    goto err_out;
 
-	  if (!count_dyn_reloc (abfd, dyn_h, dynrel_type, sec,
-				sec_symndx, rel->r_offset, rel->r_addend))
+	  /* Count dynamic relocations against global symbols.  */
+	  if (hh != NULL
+	      && !count_dyn_reloc (abfd, hh, dynrel_type, sec,
+				   sec_symndx, rel->r_offset, rel->r_addend))
 	    goto err_out;
 
 	  /* If we are building a shared library and we just recorded
@@ -980,16 +946,16 @@ struct elf64_hppa_allocate_data
 /* Should we do dynamic things to this symbol?  */
 
 static bfd_boolean
-elf64_hppa_dynamic_symbol_p (struct elf_link_hash_entry *h,
+elf64_hppa_dynamic_symbol_p (struct elf_link_hash_entry *eh,
 			     struct bfd_link_info *info)
 {
   /* ??? What, if anything, needs to happen wrt STV_PROTECTED symbols
      and relocations that retrieve a function descriptor?  Assume the
      worst for now.  */
-  if (_bfd_elf_dynamic_symbol_p (h, info, 1))
+  if (_bfd_elf_dynamic_symbol_p (eh, info, 1))
     {
       /* ??? Why is this here and not elsewhere is_local_label_name.  */
-      if (h->root.root.string[0] == '$' && h->root.root.string[1] == '$')
+      if (eh->root.root.string[0] == '$' && eh->root.root.string[1] == '$')
 	return FALSE;
 
       return TRUE;
@@ -1002,39 +968,32 @@ elf64_hppa_dynamic_symbol_p (struct elf_link_hash_entry *h,
    entries in .opd for them.  */
 
 static bfd_boolean
-elf64_hppa_mark_exported_functions (struct elf_link_hash_entry *h,
-				    void *data)
+elf64_hppa_mark_exported_functions (struct elf_link_hash_entry *eh, void *data)
 {
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
   struct bfd_link_info *info = (struct bfd_link_info *)data;
   struct elf64_hppa_link_hash_table *hppa_info;
 
-  hppa_info = elf64_hppa_hash_table (info);
+  hppa_info = hppa_link_hash_table (info);
 
-  if (h->root.type == bfd_link_hash_warning)
-    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+  if (eh->root.type == bfd_link_hash_warning)
+    eh = (struct elf_link_hash_entry *) eh->root.u.i.link;
 
-  if (h
-      && (h->root.type == bfd_link_hash_defined
-	  || h->root.type == bfd_link_hash_defweak)
-      && h->root.u.def.section->output_section != NULL
-      && h->type == STT_FUNC)
+  if (eh
+      && (eh->root.type == bfd_link_hash_defined
+	  || eh->root.type == bfd_link_hash_defweak)
+      && eh->root.u.def.section->output_section != NULL
+      && eh->type == STT_FUNC)
     {
-       struct elf64_hppa_dyn_hash_entry *dyn_h;
-
-      /* Add this symbol to the PA64 linker hash table.  */
-      dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
-					  h->root.root.string, TRUE, TRUE);
-      BFD_ASSERT (dyn_h);
-      dyn_h->h = h;
-
       if (! hppa_info->opd_sec
 	  && ! get_opd (hppa_info->root.dynobj, info, hppa_info))
 	return FALSE;
 
-      dyn_h->want_opd = 1;
+      hh->want_opd = 1;
+
       /* Put a flag here for output_symbol_hook.  */
-      dyn_h->st_shndx = -1;
-      h->needs_plt = 1;
+      hh->st_shndx = -1;
+      eh->needs_plt = 1;
     }
 
   return TRUE;
@@ -1043,33 +1002,29 @@ elf64_hppa_mark_exported_functions (struct elf_link_hash_entry *h,
 /* Allocate space for a DLT entry.  */
 
 static bfd_boolean
-allocate_global_data_dlt (struct elf64_hppa_dyn_hash_entry *dyn_h,
-			  void *data)
+allocate_global_data_dlt (struct elf_link_hash_entry *eh, void *data)
 {
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
   struct elf64_hppa_allocate_data *x = (struct elf64_hppa_allocate_data *)data;
 
-  if (dyn_h->want_dlt)
+  if (hh->want_dlt)
     {
-      struct elf_link_hash_entry *h = dyn_h->h;
-
       if (x->info->shared)
 	{
 	  /* Possibly add the symbol to the local dynamic symbol
 	     table since we might need to create a dynamic relocation
 	     against it.  */
-	  if (! h
-	      || (h->dynindx == -1 && h->type != STT_PARISC_MILLI))
+	  if (eh->dynindx == -1 && eh->type != STT_PARISC_MILLI)
 	    {
-	      bfd *owner;
-	      owner = (h ? h->root.u.def.section->owner : dyn_h->owner);
+	      bfd *owner = eh->root.u.def.section->owner;
 
 	      if (! (bfd_elf_link_record_local_dynamic_symbol
-		     (x->info, owner, dyn_h->sym_indx)))
+		     (x->info, owner, hh->sym_indx)))
 		return FALSE;
 	    }
 	}
 
-      dyn_h->dlt_offset = x->ofs;
+      hh->dlt_offset = x->ofs;
       x->ofs += DLT_ENTRY_SIZE;
     }
   return TRUE;
@@ -1078,24 +1033,24 @@ allocate_global_data_dlt (struct elf64_hppa_dyn_hash_entry *dyn_h,
 /* Allocate space for a DLT.PLT entry.  */
 
 static bfd_boolean
-allocate_global_data_plt (struct elf64_hppa_dyn_hash_entry *dyn_h,
-			  void *data)
+allocate_global_data_plt (struct elf_link_hash_entry *eh, void *data)
 {
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
   struct elf64_hppa_allocate_data *x = (struct elf64_hppa_allocate_data *)data;
 
-  if (dyn_h->want_plt
-      && elf64_hppa_dynamic_symbol_p (dyn_h->h, x->info)
-      && !((dyn_h->h->root.type == bfd_link_hash_defined
-	    || dyn_h->h->root.type == bfd_link_hash_defweak)
-	   && dyn_h->h->root.u.def.section->output_section != NULL))
+  if (hh->want_plt
+      && elf64_hppa_dynamic_symbol_p (eh, x->info)
+      && !((eh->root.type == bfd_link_hash_defined
+	    || eh->root.type == bfd_link_hash_defweak)
+	   && eh->root.u.def.section->output_section != NULL))
     {
-      dyn_h->plt_offset = x->ofs;
+      hh->plt_offset = x->ofs;
       x->ofs += PLT_ENTRY_SIZE;
-      if (dyn_h->plt_offset < 0x2000)
-	elf64_hppa_hash_table (x->info)->gp_offset = dyn_h->plt_offset;
+      if (hh->plt_offset < 0x2000)
+	hppa_link_hash_table (x->info)->gp_offset = hh->plt_offset;
     }
   else
-    dyn_h->want_plt = 0;
+    hh->want_plt = 0;
 
   return TRUE;
 }
@@ -1103,71 +1058,68 @@ allocate_global_data_plt (struct elf64_hppa_dyn_hash_entry *dyn_h,
 /* Allocate space for a STUB entry.  */
 
 static bfd_boolean
-allocate_global_data_stub (struct elf64_hppa_dyn_hash_entry *dyn_h,
-			   void *data)
+allocate_global_data_stub (struct elf_link_hash_entry *eh, void *data)
 {
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
   struct elf64_hppa_allocate_data *x = (struct elf64_hppa_allocate_data *)data;
 
-  if (dyn_h->want_stub
-      && elf64_hppa_dynamic_symbol_p (dyn_h->h, x->info)
-      && !((dyn_h->h->root.type == bfd_link_hash_defined
-	    || dyn_h->h->root.type == bfd_link_hash_defweak)
-	   && dyn_h->h->root.u.def.section->output_section != NULL))
+  if (hh->want_stub
+      && elf64_hppa_dynamic_symbol_p (eh, x->info)
+      && !((eh->root.type == bfd_link_hash_defined
+	    || eh->root.type == bfd_link_hash_defweak)
+	   && eh->root.u.def.section->output_section != NULL))
     {
-      dyn_h->stub_offset = x->ofs;
+      hh->stub_offset = x->ofs;
       x->ofs += sizeof (plt_stub);
     }
   else
-    dyn_h->want_stub = 0;
+    hh->want_stub = 0;
   return TRUE;
 }
 
 /* Allocate space for a FPTR entry.  */
 
 static bfd_boolean
-allocate_global_data_opd (struct elf64_hppa_dyn_hash_entry *dyn_h,
-			  void *data)
+allocate_global_data_opd (struct elf_link_hash_entry *eh, void *data)
 {
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
   struct elf64_hppa_allocate_data *x = (struct elf64_hppa_allocate_data *)data;
 
-  if (dyn_h->want_opd)
+  if (hh && hh->want_opd)
     {
-      struct elf_link_hash_entry *h = dyn_h->h;
-
-      if (h)
-	while (h->root.type == bfd_link_hash_indirect
-	       || h->root.type == bfd_link_hash_warning)
-	  h = (struct elf_link_hash_entry *) h->root.u.i.link;
+      while (hh->eh.root.type == bfd_link_hash_indirect
+	     || hh->eh.root.type == bfd_link_hash_warning)
+	hh = hppa_elf_hash_entry (hh->eh.root.u.i.link);
 
       /* We never need an opd entry for a symbol which is not
 	 defined by this output file.  */
-      if (h && (h->root.type == bfd_link_hash_undefined
-		|| h->root.type == bfd_link_hash_undefweak
-		|| h->root.u.def.section->output_section == NULL))
-	dyn_h->want_opd = 0;
+      if (hh && (hh->eh.root.type == bfd_link_hash_undefined
+		 || hh->eh.root.type == bfd_link_hash_undefweak
+		 || hh->eh.root.u.def.section->output_section == NULL))
+	hh->want_opd = 0;
 
       /* If we are creating a shared library, took the address of a local
 	 function or might export this function from this object file, then
 	 we have to create an opd descriptor.  */
       else if (x->info->shared
-	       || h == NULL
-	       || (h->dynindx == -1 && h->type != STT_PARISC_MILLI)
-	       || (h->root.type == bfd_link_hash_defined
-		   || h->root.type == bfd_link_hash_defweak))
+	       || hh == NULL
+	       || (hh->eh.dynindx == -1 && hh->eh.type != STT_PARISC_MILLI)
+	       || (hh->eh.root.type == bfd_link_hash_defined
+		   || hh->eh.root.type == bfd_link_hash_defweak))
 	{
 	  /* If we are creating a shared library, then we will have to
 	     create a runtime relocation for the symbol to properly
 	     initialize the .opd entry.  Make sure the symbol gets
 	     added to the dynamic symbol table.  */
 	  if (x->info->shared
-	      && (h == NULL || (h->dynindx == -1)))
+	      && (hh == NULL || (hh->eh.dynindx == -1)))
 	    {
 	      bfd *owner;
 	      /* PR 6511: Default to using the dynamic symbol table.  */
-	      owner = (dyn_h->owner ? dyn_h->owner: h->root.u.def.section->owner);
+	      owner = (hh->owner ? hh->owner: eh->root.u.def.section->owner);
 
 	      if (!bfd_elf_link_record_local_dynamic_symbol
-		    (x->info, owner, dyn_h->sym_indx))
+		    (x->info, owner, hh->sym_indx))
 		return FALSE;
 	    }
 
@@ -1176,33 +1128,33 @@ allocate_global_data_opd (struct elf64_hppa_dyn_hash_entry *dyn_h,
 	     in dynamic relocs.  But name munging does make the result
 	     much easier to debug.  ie, the EPLT reloc will reference
 	     a symbol like .foobar, instead of .text + offset.  */
-	  if (x->info->shared && h)
+	  if (x->info->shared && eh)
 	    {
 	      char *new_name;
 	      struct elf_link_hash_entry *nh;
 
-	      new_name = alloca (strlen (h->root.root.string) + 2);
+	      new_name = alloca (strlen (eh->root.root.string) + 2);
 	      new_name[0] = '.';
-	      strcpy (new_name + 1, h->root.root.string);
+	      strcpy (new_name + 1, eh->root.root.string);
 
 	      nh = elf_link_hash_lookup (elf_hash_table (x->info),
 					 new_name, TRUE, TRUE, TRUE);
 
-	      nh->root.type = h->root.type;
-	      nh->root.u.def.value = h->root.u.def.value;
-	      nh->root.u.def.section = h->root.u.def.section;
+	      nh->root.type = eh->root.type;
+	      nh->root.u.def.value = eh->root.u.def.value;
+	      nh->root.u.def.section = eh->root.u.def.section;
 
 	      if (! bfd_elf_link_record_dynamic_symbol (x->info, nh))
 		return FALSE;
 
 	     }
-	  dyn_h->opd_offset = x->ofs;
+	  hh->opd_offset = x->ofs;
 	  x->ofs += OPD_ENTRY_SIZE;
 	}
 
       /* Otherwise we do not need an opd entry.  */
       else
-	dyn_h->want_opd = 0;
+	hh->want_opd = 0;
     }
   return TRUE;
 }
@@ -1413,16 +1365,16 @@ elf64_hppa_create_dynamic_sections (bfd *abfd,
 {
   asection *s;
 
-  if (! get_stub (abfd, info, elf64_hppa_hash_table (info)))
+  if (! get_stub (abfd, info, hppa_link_hash_table (info)))
     return FALSE;
 
-  if (! get_dlt (abfd, info, elf64_hppa_hash_table (info)))
+  if (! get_dlt (abfd, info, hppa_link_hash_table (info)))
     return FALSE;
 
-  if (! get_plt (abfd, info, elf64_hppa_hash_table (info)))
+  if (! get_plt (abfd, info, hppa_link_hash_table (info)))
     return FALSE;
 
-  if (! get_opd (abfd, info, elf64_hppa_hash_table (info)))
+  if (! get_opd (abfd, info, hppa_link_hash_table (info)))
     return FALSE;
 
   s = bfd_make_section_with_flags (abfd, ".rela.dlt",
@@ -1434,7 +1386,7 @@ elf64_hppa_create_dynamic_sections (bfd *abfd,
   if (s == NULL
       || !bfd_set_section_alignment (abfd, s, 3))
     return FALSE;
-  elf64_hppa_hash_table (info)->dlt_rel_sec = s;
+  hppa_link_hash_table (info)->dlt_rel_sec = s;
 
   s = bfd_make_section_with_flags (abfd, ".rela.plt",
 				   (SEC_ALLOC | SEC_LOAD
@@ -1445,7 +1397,7 @@ elf64_hppa_create_dynamic_sections (bfd *abfd,
   if (s == NULL
       || !bfd_set_section_alignment (abfd, s, 3))
     return FALSE;
-  elf64_hppa_hash_table (info)->plt_rel_sec = s;
+  hppa_link_hash_table (info)->plt_rel_sec = s;
 
   s = bfd_make_section_with_flags (abfd, ".rela.data",
 				   (SEC_ALLOC | SEC_LOAD
@@ -1456,7 +1408,7 @@ elf64_hppa_create_dynamic_sections (bfd *abfd,
   if (s == NULL
       || !bfd_set_section_alignment (abfd, s, 3))
     return FALSE;
-  elf64_hppa_hash_table (info)->other_rel_sec = s;
+  hppa_link_hash_table (info)->other_rel_sec = s;
 
   s = bfd_make_section_with_flags (abfd, ".rela.opd",
 				   (SEC_ALLOC | SEC_LOAD
@@ -1467,7 +1419,7 @@ elf64_hppa_create_dynamic_sections (bfd *abfd,
   if (s == NULL
       || !bfd_set_section_alignment (abfd, s, 3))
     return FALSE;
-  elf64_hppa_hash_table (info)->opd_rel_sec = s;
+  hppa_link_hash_table (info)->opd_rel_sec = s;
 
   return TRUE;
 }
@@ -1476,16 +1428,16 @@ elf64_hppa_create_dynamic_sections (bfd *abfd,
    to be dynamic.  */
 
 static bfd_boolean
-allocate_dynrel_entries (struct elf64_hppa_dyn_hash_entry *dyn_h,
-			 void *data)
+allocate_dynrel_entries (struct elf_link_hash_entry *eh, void *data)
 {
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
   struct elf64_hppa_allocate_data *x = (struct elf64_hppa_allocate_data *)data;
   struct elf64_hppa_link_hash_table *hppa_info;
   struct elf64_hppa_dyn_reloc_entry *rent;
   bfd_boolean dynamic_symbol, shared;
 
-  hppa_info = elf64_hppa_hash_table (x->info);
-  dynamic_symbol = elf64_hppa_dynamic_symbol_p (dyn_h->h, x->info);
+  hppa_info = hppa_link_hash_table (x->info);
+  dynamic_symbol = elf64_hppa_dynamic_symbol_p (eh, x->info);
   shared = x->info->shared;
 
   /* We may need to allocate relocations for a non-dynamic symbol
@@ -1495,11 +1447,11 @@ allocate_dynrel_entries (struct elf64_hppa_dyn_hash_entry *dyn_h,
 
   /* Take care of the normal data relocations.  */
 
-  for (rent = dyn_h->reloc_entries; rent; rent = rent->next)
+  for (rent = hh->reloc_entries; rent; rent = rent->next)
     {
       /* Allocate one iff we are building a shared library, the relocation
 	 isn't a R_PARISC_FPTR64, or we don't want an opd entry.  */
-      if (!shared && rent->type == R_PARISC_FPTR64 && dyn_h->want_opd)
+      if (!shared && rent->type == R_PARISC_FPTR64 && hh->want_opd)
 	continue;
 
       hppa_info->other_rel_sec->size += sizeof (Elf64_External_Rela);
@@ -1507,25 +1459,24 @@ allocate_dynrel_entries (struct elf64_hppa_dyn_hash_entry *dyn_h,
       /* Make sure this symbol gets into the dynamic symbol table if it is
 	 not already recorded.  ?!? This should not be in the loop since
 	 the symbol need only be added once.  */
-      if (dyn_h->h == 0
-	  || (dyn_h->h->dynindx == -1 && dyn_h->h->type != STT_PARISC_MILLI))
+      if (eh->dynindx == -1 && eh->type != STT_PARISC_MILLI)
 	if (!bfd_elf_link_record_local_dynamic_symbol
-	    (x->info, rent->sec->owner, dyn_h->sym_indx))
+	    (x->info, rent->sec->owner, hh->sym_indx))
 	  return FALSE;
     }
 
   /* Take care of the GOT and PLT relocations.  */
 
-  if ((dynamic_symbol || shared) && dyn_h->want_dlt)
+  if ((dynamic_symbol || shared) && hh->want_dlt)
     hppa_info->dlt_rel_sec->size += sizeof (Elf64_External_Rela);
 
   /* If we are building a shared library, then every symbol that has an
      opd entry will need an EPLT relocation to relocate the symbol's address
      and __gp value based on the runtime load address.  */
-  if (shared && dyn_h->want_opd)
+  if (shared && hh->want_opd)
     hppa_info->opd_rel_sec->size += sizeof (Elf64_External_Rela);
 
-  if (dyn_h->want_plt && dynamic_symbol)
+  if (hh->want_plt && dynamic_symbol)
     {
       bfd_size_type t = 0;
 
@@ -1548,7 +1499,7 @@ allocate_dynrel_entries (struct elf64_hppa_dyn_hash_entry *dyn_h,
 
 static bfd_boolean
 elf64_hppa_adjust_dynamic_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED,
-				  struct elf_link_hash_entry *h)
+				  struct elf_link_hash_entry *eh)
 {
   /* ??? Undefined symbols with PLT entries should be re-defined
      to be the PLT entry.  */
@@ -1556,12 +1507,12 @@ elf64_hppa_adjust_dynamic_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED,
   /* 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->u.weakdef != NULL)
+  if (eh->u.weakdef != NULL)
     {
-      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
-		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->u.weakdef->root.u.def.section;
-      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      BFD_ASSERT (eh->u.weakdef->root.type == bfd_link_hash_defined
+		  || eh->u.weakdef->root.type == bfd_link_hash_defweak);
+      eh->root.u.def.section = eh->u.weakdef->root.u.def.section;
+      eh->root.u.def.value = eh->u.weakdef->root.u.def.value;
       return TRUE;
     }
 
@@ -1581,11 +1532,11 @@ elf64_hppa_adjust_dynamic_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED,
    elf64_hppa_mark_exported_functions is called.  */
 
 static bfd_boolean
-elf64_hppa_mark_milli_and_exported_functions (struct elf_link_hash_entry *h,
+elf64_hppa_mark_milli_and_exported_functions (struct elf_link_hash_entry *eh,
 					      void *data)
 {
+  struct elf_link_hash_entry *elf = eh;
   struct bfd_link_info *info = (struct bfd_link_info *)data;
-  struct elf_link_hash_entry *elf = h;
 
   if (elf->root.type == bfd_link_hash_warning)
     elf = (struct elf_link_hash_entry *) elf->root.u.i.link;
@@ -1601,25 +1552,25 @@ elf64_hppa_mark_milli_and_exported_functions (struct elf_link_hash_entry *h,
       return TRUE;
     }
 
-  return elf64_hppa_mark_exported_functions (h, data);
+  return elf64_hppa_mark_exported_functions (eh, data);
 }
 
 /* Set the final sizes of the dynamic sections and allocate memory for
    the contents of our special sections.  */
 
 static bfd_boolean
-elf64_hppa_size_dynamic_sections (bfd *output_bfd,
-				  struct bfd_link_info *info)
+elf64_hppa_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
 {
+  struct elf64_hppa_link_hash_table *hppa_info;
+  struct elf64_hppa_allocate_data data;
   bfd *dynobj;
-  asection *s;
+  bfd *ibfd;
+  asection *sec;
   bfd_boolean plt;
   bfd_boolean relocs;
   bfd_boolean reltext;
-  struct elf64_hppa_allocate_data data;
-  struct elf64_hppa_link_hash_table *hppa_info;
 
-  hppa_info = elf64_hppa_hash_table (info);
+  hppa_info = hppa_link_hash_table (info);
 
   dynobj = elf_hash_table (info)->dynobj;
   BFD_ASSERT (dynobj != NULL);
@@ -1642,10 +1593,10 @@ elf64_hppa_size_dynamic_sections (bfd *output_bfd,
       /* Set the contents of the .interp section to the interpreter.  */
       if (info->executable)
 	{
-	  s = bfd_get_section_by_name (dynobj, ".interp");
-	  BFD_ASSERT (s != NULL);
-	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
-	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	  sec = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (sec != NULL);
+	  sec->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  sec->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
 	}
     }
   else
@@ -1655,65 +1606,192 @@ elf64_hppa_size_dynamic_sections (bfd *output_bfd,
 	 not actually use these entries.  Reset the size of .rela.dlt,
 	 which will cause it to get stripped from the output file
 	 below.  */
-      s = bfd_get_section_by_name (dynobj, ".rela.dlt");
-      if (s != NULL)
-	s->size = 0;
+      sec = bfd_get_section_by_name (dynobj, ".rela.dlt");
+      if (sec != NULL)
+	sec->size = 0;
+    }
+
+  /* Set up DLT, PLT and OPD offsets for local syms, and space for local
+     dynamic relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_dlt;
+      bfd_signed_vma *end_local_dlt;
+      bfd_signed_vma *local_plt;
+      bfd_signed_vma *end_local_plt;
+      bfd_signed_vma *local_opd;
+      bfd_signed_vma *end_local_opd;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+	continue;
+
+      for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	{
+	  struct elf64_hppa_dyn_reloc_entry *hdh_p;
+
+	  for (hdh_p = ((struct elf64_hppa_dyn_reloc_entry *)
+		    elf_section_data (sec)->local_dynrel);
+	       hdh_p != NULL;
+	       hdh_p = hdh_p->next)
+	    {
+	      if (!bfd_is_abs_section (hdh_p->sec)
+		  && bfd_is_abs_section (hdh_p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (hdh_p->count != 0)
+		{
+		  srel = elf_section_data (hdh_p->sec)->sreloc;
+		  srel->size += hdh_p->count * sizeof (Elf64_External_Rela);
+		  if ((hdh_p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_dlt = elf_local_got_refcounts (ibfd);
+      if (!local_dlt)
+	continue;
+
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      locsymcount = symtab_hdr->sh_info;
+      end_local_dlt = local_dlt + locsymcount;
+      sec = hppa_info->dlt_sec;
+      srel = hppa_info->dlt_rel_sec;
+      for (; local_dlt < end_local_dlt; ++local_dlt)
+	{
+	  if (*local_dlt > 0)
+	    {
+	      *local_dlt = sec->size;
+	      sec->size += DLT_ENTRY_SIZE;
+	      if (info->shared) 
+	        {
+		  srel->size += sizeof (Elf64_External_Rela);
+	        }
+	    }
+	  else
+	    *local_dlt = (bfd_vma) -1;
+	}
+
+      local_plt = end_local_dlt;
+      end_local_plt = local_plt + locsymcount;
+      if (! hppa_info->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
+	{
+	  sec = hppa_info->plt_sec;
+	  srel = hppa_info->plt_rel_sec;
+	  for (; local_plt < end_local_plt; ++local_plt)
+	    {
+	      if (*local_plt > 0)
+		{
+		  *local_plt = sec->size;
+		  sec->size += PLT_ENTRY_SIZE;
+		  if (info->shared)
+		    srel->size += sizeof (Elf64_External_Rela);
+		}
+	      else
+		*local_plt = (bfd_vma) -1;
+	    }
+	}
+
+      local_opd = end_local_plt;
+      end_local_opd = local_opd + locsymcount;
+      if (! hppa_info->root.dynamic_sections_created)
+	{
+	  /* Won't be used, but be safe.  */
+	  for (; local_opd < end_local_opd; ++local_opd)
+	    *local_opd = (bfd_vma) -1;
+	}
+      else
+	{
+	  sec = hppa_info->opd_sec;
+	  srel = hppa_info->opd_rel_sec;
+	  for (; local_opd < end_local_opd; ++local_opd)
+	    {
+	      if (*local_opd > 0)
+		{
+		  *local_opd = sec->size;
+		  sec->size += OPD_ENTRY_SIZE;
+		  if (info->shared)
+		    srel->size += sizeof (Elf64_External_Rela);
+		}
+	      else
+		*local_opd = (bfd_vma) -1;
+	    }
+	}
     }
 
   /* Allocate the GOT entries.  */
 
   data.info = info;
-  if (elf64_hppa_hash_table (info)->dlt_sec)
+  if (hppa_info->dlt_sec)
     {
-      data.ofs = 0x0;
-      elf64_hppa_dyn_hash_traverse (&hppa_info->dyn_hash_table,
-				    allocate_global_data_dlt, &data);
+      data.ofs = hppa_info->dlt_sec->size;
+      elf_link_hash_traverse (elf_hash_table (info),
+			      allocate_global_data_dlt, &data);
       hppa_info->dlt_sec->size = data.ofs;
+    }
 
-      data.ofs = 0x0;
-      elf64_hppa_dyn_hash_traverse (&hppa_info->dyn_hash_table,
-				    allocate_global_data_plt, &data);
+  if (hppa_info->plt_sec)
+    {
+      data.ofs = hppa_info->plt_sec->size;
+      elf_link_hash_traverse (elf_hash_table (info),
+		              allocate_global_data_plt, &data);
       hppa_info->plt_sec->size = data.ofs;
+    }
 
+  if (hppa_info->stub_sec)
+    {
       data.ofs = 0x0;
-      elf64_hppa_dyn_hash_traverse (&hppa_info->dyn_hash_table,
-				    allocate_global_data_stub, &data);
+      elf_link_hash_traverse (elf_hash_table (info),
+			      allocate_global_data_stub, &data);
       hppa_info->stub_sec->size = data.ofs;
     }
 
   /* Allocate space for entries in the .opd section.  */
-  if (elf64_hppa_hash_table (info)->opd_sec)
+  if (hppa_info->opd_sec)
     {
-      data.ofs = 0;
-      elf64_hppa_dyn_hash_traverse (&hppa_info->dyn_hash_table,
-				    allocate_global_data_opd, &data);
+      data.ofs = hppa_info->opd_sec->size;
+      elf_link_hash_traverse (elf_hash_table (info),
+			      allocate_global_data_opd, &data);
       hppa_info->opd_sec->size = data.ofs;
     }
 
   /* Now allocate space for dynamic relocations, if necessary.  */
   if (hppa_info->root.dynamic_sections_created)
-    elf64_hppa_dyn_hash_traverse (&hppa_info->dyn_hash_table,
-				  allocate_dynrel_entries, &data);
+    elf_link_hash_traverse (elf_hash_table (info),
+			    allocate_dynrel_entries, &data);
 
   /* The sizes of all the sections are set.  Allocate memory for them.  */
   plt = FALSE;
   relocs = FALSE;
   reltext = FALSE;
-  for (s = dynobj->sections; s != NULL; s = s->next)
+  for (sec = dynobj->sections; sec != NULL; sec = sec->next)
     {
       const char *name;
 
-      if ((s->flags & SEC_LINKER_CREATED) == 0)
+      if ((sec->flags & SEC_LINKER_CREATED) == 0)
 	continue;
 
       /* It's OK to base decisions on the section name, because none
 	 of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
+      name = bfd_get_section_name (dynobj, sec);
 
       if (strcmp (name, ".plt") == 0)
 	{
 	  /* Remember whether there is a PLT.  */
-	  plt = s->size != 0;
+	  plt = sec->size != 0;
 	}
       else if (strcmp (name, ".opd") == 0
 	       || CONST_STRNEQ (name, ".dlt")
@@ -1724,7 +1802,7 @@ elf64_hppa_size_dynamic_sections (bfd *output_bfd,
 	}
       else if (CONST_STRNEQ (name, ".rela"))
 	{
-	  if (s->size != 0)
+	  if (sec->size != 0)
 	    {
 	      asection *target;
 
@@ -1742,7 +1820,7 @@ elf64_hppa_size_dynamic_sections (bfd *output_bfd,
 		     really apply to the .got section, which we
 		     created ourselves and so know is not readonly.  */
 		  outname = bfd_get_section_name (output_bfd,
-						  s->output_section);
+						  sec->output_section);
 		  target = bfd_get_section_by_name (output_bfd, outname + 4);
 		  if (target != NULL
 		      && (target->flags & SEC_READONLY) != 0
@@ -1752,7 +1830,7 @@ elf64_hppa_size_dynamic_sections (bfd *output_bfd,
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
-	      s->reloc_count = 0;
+	      sec->reloc_count = 0;
 	    }
 	}
       else
@@ -1761,7 +1839,7 @@ elf64_hppa_size_dynamic_sections (bfd *output_bfd,
 	  continue;
 	}
 
-      if (s->size == 0)
+      if (sec->size == 0)
 	{
 	  /* If we don't need this section, strip it from the
 	     output file.  This is mostly to handle .rela.bss and
@@ -1772,11 +1850,11 @@ elf64_hppa_size_dynamic_sections (bfd *output_bfd,
 	     adjust_dynamic_symbol is called, and it is that
 	     function which decides whether anything needs to go
 	     into these sections.  */
-	  s->flags |= SEC_EXCLUDE;
+	  sec->flags |= SEC_EXCLUDE;
 	  continue;
 	}
 
-      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+      if ((sec->flags & SEC_HAS_CONTENTS) == 0)
 	continue;
 
       /* Allocate memory for the section contents if it has not
@@ -1785,10 +1863,10 @@ elf64_hppa_size_dynamic_sections (bfd *output_bfd,
 	 contents are written out.  This should not happen, but this
 	 way if it does, we get a R_PARISC_NONE reloc instead of
 	 garbage.  */
-      if (s->contents == NULL)
+      if (sec->contents == NULL)
 	{
-	  s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
-	  if (s->contents == NULL)
+	  sec->contents = (bfd_byte *) bfd_zalloc (dynobj, sec->size);
+	  if (sec->contents == NULL)
 	    return FALSE;
 	}
     }
@@ -1861,25 +1939,17 @@ elf64_hppa_size_dynamic_sections (bfd *output_bfd,
    table.  Ick.  */
 
 static bfd_boolean
-elf64_hppa_link_output_symbol_hook (struct bfd_link_info *info,
+elf64_hppa_link_output_symbol_hook (struct bfd_link_info *info ATTRIBUTE_UNUSED,
 				    const char *name,
 				    Elf_Internal_Sym *sym,
 				    asection *input_sec ATTRIBUTE_UNUSED,
-				    struct elf_link_hash_entry *h)
+				    struct elf_link_hash_entry *eh)
 {
-  struct elf64_hppa_link_hash_table *hppa_info;
-  struct elf64_hppa_dyn_hash_entry *dyn_h;
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
 
   /* We may be called with the file symbol or section symbols.
      They never need munging, so it is safe to ignore them.  */
-  if (!name)
-    return TRUE;
-
-  /* Get the PA dyn_symbol (if any) associated with NAME.  */
-  hppa_info = elf64_hppa_hash_table (info);
-  dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
-				      name, FALSE, FALSE);
-  if (!dyn_h || dyn_h->h != h)
+  if (!name || !eh)
     return TRUE;
 
   /* Function symbols for which we created .opd entries *may* have been
@@ -1888,12 +1958,12 @@ elf64_hppa_link_output_symbol_hook (struct bfd_link_info *info,
      Note that finish_dynamic_symbol sometimes turns dynamic symbols
      into non-dynamic ones, so we initialize st_shndx to -1 in
      mark_exported_functions and check to see if it was overwritten
-     here instead of just checking dyn_h->h->dynindx.  */
-  if (dyn_h->want_opd && dyn_h->st_shndx != -1)
+     here instead of just checking eh->dynindx.  */
+  if (hh->want_opd && hh->st_shndx != -1)
     {
       /* Restore the saved value and section index.  */
-      sym->st_value = dyn_h->st_value;
-      sym->st_shndx = dyn_h->st_shndx;
+      sym->st_value = hh->st_value;
+      sym->st_shndx = hh->st_shndx;
     }
 
   return TRUE;
@@ -1905,16 +1975,14 @@ elf64_hppa_link_output_symbol_hook (struct bfd_link_info *info,
 static bfd_boolean
 elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
 				  struct bfd_link_info *info,
-				  struct elf_link_hash_entry *h,
+				  struct elf_link_hash_entry *eh,
 				  Elf_Internal_Sym *sym)
 {
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
   asection *stub, *splt, *sdlt, *sopd, *spltrel, *sdltrel;
   struct elf64_hppa_link_hash_table *hppa_info;
-  struct elf64_hppa_dyn_hash_entry *dyn_h;
 
-  hppa_info = elf64_hppa_hash_table (info);
-  dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
-				      h->root.root.string, FALSE, FALSE);
+  hppa_info = hppa_link_hash_table (info);
 
   stub = hppa_info->stub_sec;
   splt = hppa_info->plt_sec;
@@ -1930,18 +1998,18 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
      We will store a new value and section index into the symbol long
      enough to output it into the dynamic symbol table, then we restore
      the original values (in elf64_hppa_link_output_symbol_hook).  */
-  if (dyn_h && dyn_h->want_opd)
+  if (hh->want_opd)
     {
       BFD_ASSERT (sopd != NULL);
 
       /* Save away the original value and section index so that we
 	 can restore them later.  */
-      dyn_h->st_value = sym->st_value;
-      dyn_h->st_shndx = sym->st_shndx;
+      hh->st_value = sym->st_value;
+      hh->st_shndx = sym->st_shndx;
 
       /* For the dynamic symbol table entry, we want the value to be
 	 address of this symbol's entry within the .opd section.  */
-      sym->st_value = (dyn_h->opd_offset
+      sym->st_value = (hh->opd_offset
 		       + sopd->output_offset
 		       + sopd->output_section->vma);
       sym->st_shndx = _bfd_elf_section_from_bfd_section (output_bfd,
@@ -1949,8 +2017,8 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
     }
 
   /* Initialize a .plt entry if requested.  */
-  if (dyn_h && dyn_h->want_plt
-      && elf64_hppa_dynamic_symbol_p (dyn_h->h, info))
+  if (hh->want_plt
+      && elf64_hppa_dynamic_symbol_p (eh, info))
     {
       bfd_vma value;
       Elf_Internal_Rela rel;
@@ -1962,10 +2030,10 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
 	 if we are creating a shared library and the symbol is
 	 still undefined, we create a dynamic relocation to fill
 	 in the correct value.  */
-      if (info->shared && h->root.type == bfd_link_hash_undefined)
+      if (info->shared && eh->root.type == bfd_link_hash_undefined)
 	value = 0;
       else
-	value = (h->root.u.def.value + h->root.u.def.section->vma);
+	value = (eh->root.u.def.value + eh->root.u.def.section->vma);
 
       /* Fill in the entry in the procedure linkage table.
 
@@ -1978,9 +2046,9 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
 	 We are modifying the in-memory PLT contents here, so we do not add
 	 in the output_offset of the PLT section.  */
 
-      bfd_put_64 (splt->owner, value, splt->contents + dyn_h->plt_offset);
+      bfd_put_64 (splt->owner, value, splt->contents + hh->plt_offset);
       value = _bfd_get_gp_value (splt->output_section->owner);
-      bfd_put_64 (splt->owner, value, splt->contents + dyn_h->plt_offset + 0x8);
+      bfd_put_64 (splt->owner, value, splt->contents + hh->plt_offset + 0x8);
 
       /* Create a dynamic IPLT relocation for this entry.
 
@@ -1988,9 +2056,9 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
 	 which is included within the DLT secton.  So we do need to include
 	 the PLT's output_offset in the computation of the relocation's
 	 address.  */
-      rel.r_offset = (dyn_h->plt_offset + splt->output_offset
+      rel.r_offset = (hh->plt_offset + splt->output_offset
 		      + splt->output_section->vma);
-      rel.r_info = ELF64_R_INFO (h->dynindx, R_PARISC_IPLT);
+      rel.r_info = ELF64_R_INFO (hh->eh.dynindx, R_PARISC_IPLT);
       rel.r_addend = 0;
 
       loc = spltrel->contents;
@@ -1999,8 +2067,8 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
     }
 
   /* Initialize an external call stub entry if requested.  */
-  if (dyn_h && dyn_h->want_stub
-      && elf64_hppa_dynamic_symbol_p (dyn_h->h, info))
+  if (hh->want_stub
+      && elf64_hppa_dynamic_symbol_p (eh, info))
     {
       bfd_vma value;
       int insn;
@@ -2012,7 +2080,7 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
 
 	 We are modifying the contents of the stub section, so we do not
 	 need to include the stub section's output_offset here.  */
-      memcpy (stub->contents + dyn_h->stub_offset, plt_stub, sizeof (plt_stub));
+      memcpy (stub->contents + hh->stub_offset, plt_stub, sizeof (plt_stub));
 
       /* Fix up the first ldd instruction.
 
@@ -2025,9 +2093,9 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
 	 the same address as the start of the PLT section.
 
 	 gp_offset contains the offset of __gp within the PLT section.  */
-      value = dyn_h->plt_offset - hppa_info->gp_offset;
+      value = hh->plt_offset - hppa_info->gp_offset;
 
-      insn = bfd_get_32 (stub->owner, stub->contents + dyn_h->stub_offset);
+      insn = bfd_get_32 (stub->owner, stub->contents + hh->stub_offset);
       if (output_bfd->arch_info->mach >= 25)
 	{
 	  /* Wide mode allows 16 bit offsets.  */
@@ -2045,17 +2113,17 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
       if ((value & 7) || value + max_offset >= 2*max_offset - 8)
 	{
 	  (*_bfd_error_handler) (_("stub entry for %s cannot load .plt, dp offset = %ld"),
-				 dyn_h->root.string,
+				 hh->eh.root.root.string,
 				 (long) value);
 	  return FALSE;
 	}
 
       bfd_put_32 (stub->owner, (bfd_vma) insn,
-		  stub->contents + dyn_h->stub_offset);
+		  stub->contents + hh->stub_offset);
 
       /* Fix up the second ldd instruction.  */
       value += 8;
-      insn = bfd_get_32 (stub->owner, stub->contents + dyn_h->stub_offset + 8);
+      insn = bfd_get_32 (stub->owner, stub->contents + hh->stub_offset + 8);
       if (output_bfd->arch_info->mach >= 25)
 	{
 	  insn &= ~ 0xfff1;
@@ -2067,7 +2135,7 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
 	  insn |= re_assemble_14 ((int) value);
 	}
       bfd_put_32 (stub->owner, (bfd_vma) insn,
-		  stub->contents + dyn_h->stub_offset + 8);
+		  stub->contents + hh->stub_offset + 8);
     }
 
   return TRUE;
@@ -2077,20 +2145,19 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
    exports.  Initialize the FPTR entries.  */
 
 static bfd_boolean
-elf64_hppa_finalize_opd (struct elf64_hppa_dyn_hash_entry *dyn_h,
-			 void *data)
+elf64_hppa_finalize_opd (struct elf_link_hash_entry *eh, void *data)
 {
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
   struct bfd_link_info *info = (struct bfd_link_info *)data;
   struct elf64_hppa_link_hash_table *hppa_info;
-  struct elf_link_hash_entry *h = dyn_h ? dyn_h->h : NULL;
   asection *sopd;
   asection *sopdrel;
 
-  hppa_info = elf64_hppa_hash_table (info);
+  hppa_info = hppa_link_hash_table (info);
   sopd = hppa_info->opd_sec;
   sopdrel = hppa_info->opd_rel_sec;
 
-  if (h && dyn_h->want_opd)
+  if (hh->want_opd)
     {
       bfd_vma value;
 
@@ -2098,24 +2165,24 @@ elf64_hppa_finalize_opd (struct elf64_hppa_dyn_hash_entry *dyn_h,
 
 	 We are modifying the contents of the OPD section in memory, so we
 	 do not need to include its output offset in this computation.  */
-      memset (sopd->contents + dyn_h->opd_offset, 0, 16);
+      memset (sopd->contents + hh->opd_offset, 0, 16);
 
-      value = (h->root.u.def.value
-	       + h->root.u.def.section->output_section->vma
-	       + h->root.u.def.section->output_offset);
+      value = (eh->root.u.def.value
+	       + eh->root.u.def.section->output_section->vma
+	       + eh->root.u.def.section->output_offset);
 
       /* The next word is the address of the function.  */
-      bfd_put_64 (sopd->owner, value, sopd->contents + dyn_h->opd_offset + 16);
+      bfd_put_64 (sopd->owner, value, sopd->contents + hh->opd_offset + 16);
 
       /* The last word is our local __gp value.  */
       value = _bfd_get_gp_value (sopd->output_section->owner);
-      bfd_put_64 (sopd->owner, value, sopd->contents + dyn_h->opd_offset + 24);
+      bfd_put_64 (sopd->owner, value, sopd->contents + hh->opd_offset + 24);
     }
 
   /* If we are generating a shared library, we must generate EPLT relocations
      for each entry in the .opd, even for static functions (they may have
      had their address taken).  */
-  if (info->shared && dyn_h && dyn_h->want_opd)
+  if (info->shared && hh->want_opd)
     {
       Elf_Internal_Rela rel;
       bfd_byte *loc;
@@ -2124,16 +2191,16 @@ elf64_hppa_finalize_opd (struct elf64_hppa_dyn_hash_entry *dyn_h,
       /* We may need to do a relocation against a local symbol, in
 	 which case we have to look up it's dynamic symbol index off
 	 the local symbol hash table.  */
-      if (h && h->dynindx != -1)
-	dynindx = h->dynindx;
+      if (eh->dynindx != -1)
+	dynindx = eh->dynindx;
       else
 	dynindx
-	  = _bfd_elf_link_lookup_local_dynindx (info, dyn_h->owner,
-						dyn_h->sym_indx);
+	  = _bfd_elf_link_lookup_local_dynindx (info, hh->owner,
+						hh->sym_indx);
 
       /* The offset of this relocation is the absolute address of the
 	 .opd entry for this symbol.  */
-      rel.r_offset = (dyn_h->opd_offset + sopd->output_offset
+      rel.r_offset = (hh->opd_offset + sopd->output_offset
 		      + sopd->output_section->vma);
 
       /* If H is non-null, then we have an external symbol.
@@ -2163,14 +2230,14 @@ elf64_hppa_finalize_opd (struct elf64_hppa_dyn_hash_entry *dyn_h,
 	 We do have to play similar games for FPTR relocations in shared
 	 libraries, including those for static symbols.  See the FPTR
 	 handling in elf64_hppa_finalize_dynreloc.  */
-      if (h)
+      if (eh)
 	{
 	  char *new_name;
 	  struct elf_link_hash_entry *nh;
 
-	  new_name = alloca (strlen (h->root.root.string) + 2);
+	  new_name = alloca (strlen (eh->root.root.string) + 2);
 	  new_name[0] = '.';
-	  strcpy (new_name + 1, h->root.root.string);
+	  strcpy (new_name + 1, eh->root.root.string);
 
 	  nh = elf_link_hash_lookup (elf_hash_table (info),
 				     new_name, TRUE, TRUE, FALSE);
@@ -2196,15 +2263,14 @@ elf64_hppa_finalize_opd (struct elf64_hppa_dyn_hash_entry *dyn_h,
    we can not depend on finish_dynamic_symbol to initialize the .dlt.  */
 
 static bfd_boolean
-elf64_hppa_finalize_dlt (struct elf64_hppa_dyn_hash_entry *dyn_h,
-			 void *data)
+elf64_hppa_finalize_dlt (struct elf_link_hash_entry *eh, void *data)
 {
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
   struct bfd_link_info *info = (struct bfd_link_info *)data;
   struct elf64_hppa_link_hash_table *hppa_info;
   asection *sdlt, *sdltrel;
-  struct elf_link_hash_entry *h = dyn_h ? dyn_h->h : NULL;
 
-  hppa_info = elf64_hppa_hash_table (info);
+  hppa_info = hppa_link_hash_table (info);
 
   sdlt = hppa_info->dlt_sec;
   sdltrel = hppa_info->dlt_rel_sec;
@@ -2213,7 +2279,7 @@ elf64_hppa_finalize_dlt (struct elf64_hppa_dyn_hash_entry *dyn_h,
      address, so there is no need to create a relocation.  Just install
      the proper value into the DLT, note this shortcut can not be
      skipped when building a shared library.  */
-  if (! info->shared && h && dyn_h->want_dlt)
+  if (! info->shared && hh && hh->want_dlt)
     {
       bfd_vma value;
 
@@ -2223,21 +2289,21 @@ elf64_hppa_finalize_dlt (struct elf64_hppa_dyn_hash_entry *dyn_h,
 	 We include the OPD's output offset in this computation as
 	 we are referring to an absolute address in the resulting
 	 object file.  */
-      if (dyn_h->want_opd)
+      if (hh->want_opd)
 	{
-	  value = (dyn_h->opd_offset
+	  value = (hh->opd_offset
 		   + hppa_info->opd_sec->output_offset
 		   + hppa_info->opd_sec->output_section->vma);
 	}
-      else if ((h->root.type == bfd_link_hash_defined
-		|| h->root.type == bfd_link_hash_defweak)
-	       && h->root.u.def.section)
+      else if ((eh->root.type == bfd_link_hash_defined
+		|| eh->root.type == bfd_link_hash_defweak)
+	       && eh->root.u.def.section)
 	{
-	  value = h->root.u.def.value + h->root.u.def.section->output_offset;
-	  if (h->root.u.def.section->output_section)
-	    value += h->root.u.def.section->output_section->vma;
+	  value = eh->root.u.def.value + eh->root.u.def.section->output_offset;
+	  if (eh->root.u.def.section->output_section)
+	    value += eh->root.u.def.section->output_section->vma;
 	  else
-	    value += h->root.u.def.section->vma;
+	    value += eh->root.u.def.section->vma;
 	}
       else
 	/* We have an undefined function reference.  */
@@ -2245,13 +2311,13 @@ elf64_hppa_finalize_dlt (struct elf64_hppa_dyn_hash_entry *dyn_h,
 
       /* We do not need to include the output offset of the DLT section
 	 here because we are modifying the in-memory contents.  */
-      bfd_put_64 (sdlt->owner, value, sdlt->contents + dyn_h->dlt_offset);
+      bfd_put_64 (sdlt->owner, value, sdlt->contents + hh->dlt_offset);
     }
 
   /* Create a relocation for the DLT entry associated with this symbol.
      When building a shared library the symbol does not have to be dynamic.  */
-  if (dyn_h->want_dlt
-      && (elf64_hppa_dynamic_symbol_p (dyn_h->h, info) || info->shared))
+  if (hh->want_dlt
+      && (elf64_hppa_dynamic_symbol_p (eh, info) || info->shared))
     {
       Elf_Internal_Rela rel;
       bfd_byte *loc;
@@ -2260,19 +2326,19 @@ elf64_hppa_finalize_dlt (struct elf64_hppa_dyn_hash_entry *dyn_h,
       /* We may need to do a relocation against a local symbol, in
 	 which case we have to look up it's dynamic symbol index off
 	 the local symbol hash table.  */
-      if (h && h->dynindx != -1)
-	dynindx = h->dynindx;
+      if (eh && eh->dynindx != -1)
+	dynindx = eh->dynindx;
       else
 	dynindx
-	  = _bfd_elf_link_lookup_local_dynindx (info, dyn_h->owner,
-						dyn_h->sym_indx);
+	  = _bfd_elf_link_lookup_local_dynindx (info, hh->owner,
+						hh->sym_indx);
 
       /* Create a dynamic relocation for this entry.  Do include the output
 	 offset of the DLT entry since we need an absolute address in the
 	 resulting object file.  */
-      rel.r_offset = (dyn_h->dlt_offset + sdlt->output_offset
+      rel.r_offset = (hh->dlt_offset + sdlt->output_offset
 		      + sdlt->output_section->vma);
-      if (h && h->type == STT_FUNC)
+      if (eh && eh->type == STT_FUNC)
 	  rel.r_info = ELF64_R_INFO (dynindx, R_PARISC_FPTR64);
       else
 	  rel.r_info = ELF64_R_INFO (dynindx, R_PARISC_DIR64);
@@ -2289,45 +2355,44 @@ elf64_hppa_finalize_dlt (struct elf64_hppa_dyn_hash_entry *dyn_h,
    for dynamic functions used to initialize static data.  */
 
 static bfd_boolean
-elf64_hppa_finalize_dynreloc (struct elf64_hppa_dyn_hash_entry *dyn_h,
+elf64_hppa_finalize_dynreloc (struct elf_link_hash_entry *eh,
 			      void *data)
 {
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
   struct bfd_link_info *info = (struct bfd_link_info *)data;
   struct elf64_hppa_link_hash_table *hppa_info;
-  struct elf_link_hash_entry *h;
   int dynamic_symbol;
 
-  dynamic_symbol = elf64_hppa_dynamic_symbol_p (dyn_h->h, info);
+  dynamic_symbol = elf64_hppa_dynamic_symbol_p (eh, info);
 
   if (!dynamic_symbol && !info->shared)
     return TRUE;
 
-  if (dyn_h->reloc_entries)
+  if (hh->reloc_entries)
     {
       struct elf64_hppa_dyn_reloc_entry *rent;
       int dynindx;
 
-      hppa_info = elf64_hppa_hash_table (info);
-      h = dyn_h->h;
+      hppa_info = hppa_link_hash_table (info);
 
       /* We may need to do a relocation against a local symbol, in
 	 which case we have to look up it's dynamic symbol index off
 	 the local symbol hash table.  */
-      if (h && h->dynindx != -1)
-	dynindx = h->dynindx;
+      if (eh->dynindx != -1)
+	dynindx = eh->dynindx;
       else
 	dynindx
-	  = _bfd_elf_link_lookup_local_dynindx (info, dyn_h->owner,
-						dyn_h->sym_indx);
+	  = _bfd_elf_link_lookup_local_dynindx (info, hh->owner,
+						hh->sym_indx);
 
-      for (rent = dyn_h->reloc_entries; rent; rent = rent->next)
+      for (rent = hh->reloc_entries; rent; rent = rent->next)
 	{
 	  Elf_Internal_Rela rel;
 	  bfd_byte *loc;
 
 	  /* Allocate one iff we are building a shared library, the relocation
 	     isn't a R_PARISC_FPTR64, or we don't want an opd entry.  */
-	  if (!info->shared && rent->type == R_PARISC_FPTR64 && dyn_h->want_opd)
+	  if (!info->shared && rent->type == R_PARISC_FPTR64 && hh->want_opd)
 	    continue;
 
 	  /* Create a dynamic relocation for this entry.
@@ -2357,12 +2422,12 @@ elf64_hppa_finalize_dynreloc (struct elf64_hppa_dyn_hash_entry *dyn_h,
 	     We use a section symbol recorded by check_relocs as the
 	     base symbol for the relocation.  The addend is the difference
 	     between the section symbol and the address of the .opd entry.  */
-	  if (info->shared && rent->type == R_PARISC_FPTR64 && dyn_h->want_opd)
+	  if (info->shared && rent->type == R_PARISC_FPTR64 && hh->want_opd)
 	    {
 	      bfd_vma value, value2;
 
 	      /* First compute the address of the opd entry for this symbol.  */
-	      value = (dyn_h->opd_offset
+	      value = (hh->opd_offset
 		       + hppa_info->opd_sec->output_section->vma
 		       + hppa_info->opd_sec->output_offset);
 
@@ -2431,23 +2496,23 @@ elf64_hppa_finish_dynamic_sections (bfd *output_bfd,
   asection *sdyn;
   struct elf64_hppa_link_hash_table *hppa_info;
 
-  hppa_info = elf64_hppa_hash_table (info);
+  hppa_info = hppa_link_hash_table (info);
 
   /* Finalize the contents of the .opd section.  */
-  elf64_hppa_dyn_hash_traverse (&hppa_info->dyn_hash_table,
-				elf64_hppa_finalize_opd,
-				info);
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf64_hppa_finalize_opd,
+			  info);
 
-  elf64_hppa_dyn_hash_traverse (&hppa_info->dyn_hash_table,
-				elf64_hppa_finalize_dynreloc,
-				info);
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf64_hppa_finalize_dynreloc,
+			  info);
 
   /* Finalize the contents of the .dlt section.  */
   dynobj = elf_hash_table (info)->dynobj;
   /* Finalize the contents of the .dlt section.  */
-  elf64_hppa_dyn_hash_traverse (&hppa_info->dyn_hash_table,
-				elf64_hppa_finalize_dlt,
-				info);
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf64_hppa_finalize_dlt,
+			  info);
 
   sdyn = bfd_get_section_by_name (dynobj, ".dynamic");