* Makefile.am: Run "make dep-am".
[deliverable/binutils-gdb.git] / bfd / elf32-hppa.c
index 2c01b95be38b2fde0f55981c1fbdd7768f94f613..74482f34a7929c6eaaee3e2a1f081cc860b08e0c 100644 (file)
@@ -1,6 +1,6 @@
 /* BFD back-end for HP PA-RISC ELF files.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2001,
+   2002 Free Software Foundation, Inc.
 
    Original code by
        Center for Software Science
@@ -32,8 +32,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libhppa.h"
 #include "elf32-hppa.h"
 #define ARCH_SIZE              32
-#include "elf-hppa.h"
 #include "elf32-hppa.h"
+#include "elf-hppa.h"
 
 /* In order to gain some understanding of code in this file without
    knowing all the intricate details of the linker, note the
@@ -114,7 +114,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    :           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"
 
@@ -213,10 +212,6 @@ struct elf32_hppa_link_hash_entry {
 
   /* 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;
 };
 
 struct elf32_hppa_link_hash_table {
@@ -267,6 +262,9 @@ struct elf32_hppa_link_hash_table {
 
   /* Set if we need a .plt stub to support lazy dynamic linking.  */
   unsigned int need_plt_stub:1;
+
+  /* Small local sym to section mapping cache.  */
+  struct sym_sec_cache sym_sec;
 };
 
 /* Various hash macros and functions.  */
@@ -337,12 +335,15 @@ static boolean elf32_hppa_gc_sweep_hook
           asection *, const Elf_Internal_Rela *));
 
 static void elf32_hppa_hide_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, boolean));
 
 static boolean elf32_hppa_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 
-static boolean hppa_handle_PIC_calls
+static boolean mark_PIC_calls
+  PARAMS ((struct elf_link_hash_entry *, PTR));
+
+static boolean allocate_plt_static
   PARAMS ((struct elf_link_hash_entry *, PTR));
 
 static boolean allocate_dynrelocs
@@ -462,7 +463,6 @@ hppa_link_hash_newfunc (entry, table, string)
       eh->maybe_pic_call = 0;
       eh->pic_call = 0;
       eh->plabel = 0;
-      eh->plt_abs = 0;
     }
 
   return entry;
@@ -509,6 +509,7 @@ elf32_hppa_link_hash_table_create (abfd)
   ret->has_12bit_branch = 0;
   ret->has_17bit_branch = 0;
   ret->need_plt_stub = 0;
+  ret->sym_sec.abfd = NULL;
 
   return &ret->elf.root;
 }
@@ -590,20 +591,8 @@ hppa_get_stub_entry (input_section, sym_sec, hash, rel, htab)
 
       stub_entry = hppa_stub_hash_lookup (&htab->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_archive_filename (input_section->owner),
-                                  input_section->name,
-                                  (long) rel->r_offset,
-                                  stub_name);
-       }
-      else
-       {
-         if (hash != NULL)
-           hash->stub_cache = stub_entry;
-       }
+      if (hash != NULL)
+       hash->stub_cache = stub_entry;
 
       free (stub_name);
     }
@@ -1133,7 +1122,7 @@ elf32_hppa_create_dynamic_sections (abfd, info)
 
 /* Copy the extra info we tack onto an elf_link_hash_entry.  */
 
-void
+static void
 elf32_hppa_copy_indirect_symbol (dir, ind)
      struct elf_link_hash_entry *dir, *ind;
 {
@@ -1142,21 +1131,49 @@ elf32_hppa_copy_indirect_symbol (dir, ind)
   edir = (struct elf32_hppa_link_hash_entry *) dir;
   eind = (struct elf32_hppa_link_hash_entry *) ind;
 
-  if (edir->dyn_relocs == NULL)
+  if (eind->dyn_relocs != NULL)
     {
+      if (edir->dyn_relocs != NULL)
+       {
+         struct elf32_hppa_dyn_reloc_entry **pp;
+         struct elf32_hppa_dyn_reloc_entry *p;
+
+         if (ind->root.type == bfd_link_hash_indirect)
+           abort ();
+
+         /* Add reloc counts against the weak sym to the strong sym
+            list.  Merge any entries against the same section.  */
+         for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+           {
+             struct elf32_hppa_dyn_reloc_entry *q;
+
+             for (q = edir->dyn_relocs; q != NULL; q = q->next)
+               if (q->sec == p->sec)
+                 {
+#if RELATIVE_DYNRELOCS
+                   q->relative_count += p->relative_count;
+#endif
+                   q->count += p->count;
+                   *pp = p->next;
+                   break;
+                 }
+             if (q == NULL)
+               pp = &p->next;
+           }
+         *pp = edir->dyn_relocs;
+       }
+
       edir->dyn_relocs = eind->dyn_relocs;
       eind->dyn_relocs = NULL;
     }
-  else if (eind->dyn_relocs != NULL)
-    abort ();
 
   _bfd_elf_link_hash_copy_indirect (dir, ind);
 }
 
 /* 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.  */
+   calculate needed space in the global offset table, procedure linkage
+   table, and dynamic reloc sections.  At this point we haven't
+   necessarily read all the input files.  */
 
 static boolean
 elf32_hppa_check_relocs (abfd, info, sec, relocs)
@@ -1165,10 +1182,8 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
      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 *htab;
@@ -1179,10 +1194,8 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
     return true;
 
   htab = hppa_link_hash_table (info);
-  dynobj = htab->elf.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;
 
@@ -1353,25 +1366,24 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
        {
          /* Allocate space for a GOT entry, as well as a dynamic
             relocation for this entry.  */
-         if (dynobj == NULL)
-           htab->elf.dynobj = dynobj = abfd;
-
          if (htab->sgot == NULL)
            {
-             if (! elf32_hppa_create_dynamic_sections (dynobj, info))
+             if (htab->elf.dynobj == NULL)
+               htab->elf.dynobj = abfd;
+             if (!elf32_hppa_create_dynamic_sections (htab->elf.dynobj, info))
                return false;
            }
 
          if (h != NULL)
            {
-             if (h->elf.got.refcount == -1)
-               h->elf.got.refcount = 1;
-             else
-               h->elf.got.refcount += 1;
+             h->elf.got.refcount += 1;
            }
          else
            {
+             bfd_signed_vma *local_got_refcounts;
+
              /* This is a global offset table entry for a local symbol.  */
+             local_got_refcounts = elf_local_got_refcounts (abfd);
              if (local_got_refcounts == NULL)
                {
                  bfd_size_type size;
@@ -1406,13 +1418,8 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
            {
              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;
+                 h->elf.elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
+                 h->elf.plt.refcount += 1;
 
                  /* If this .plt entry is for a plabel, mark it so
                     that adjust_dynamic_symbol will keep the entry
@@ -1422,8 +1429,10 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
                }
              else if (need_entry & PLT_PLABEL)
                {
+                 bfd_signed_vma *local_got_refcounts;
                  bfd_signed_vma *local_plt_refcounts;
 
+                 local_got_refcounts = elf_local_got_refcounts (abfd);
                  if (local_got_refcounts == NULL)
                    {
                      bfd_size_type size;
@@ -1496,14 +1505,15 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
                      || (h->elf.elf_link_hash_flags
                          & ELF_LINK_HASH_DEF_REGULAR) == 0)))
            {
+             struct elf32_hppa_dyn_reloc_entry *p;
+             struct elf32_hppa_dyn_reloc_entry **head;
+
              /* Create a reloc section in dynobj and make room for
                 this reloc.  */
              if (sreloc == NULL)
                {
                  char *name;
-
-                 if (dynobj == NULL)
-                   htab->elf.dynobj = dynobj = abfd;
+                 bfd *dynobj;
 
                  name = (bfd_elf_string_from_elf_section
                          (abfd,
@@ -1518,6 +1528,10 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
                      return false;
                    }
 
+                 if (htab->elf.dynobj == NULL)
+                   htab->elf.dynobj = abfd;
+
+                 dynobj = htab->elf.dynobj;
                  sreloc = bfd_get_section_by_name (dynobj, name);
                  if (sreloc == NULL)
                    {
@@ -1541,35 +1555,46 @@ elf32_hppa_check_relocs (abfd, info, sec, relocs)
                 relocations we need for this symbol.  */
              if (h != NULL)
                {
-                 struct elf32_hppa_dyn_reloc_entry *p;
+                 head = &h->dyn_relocs;
+               }
+             else
+               {
+                 /* Track dynamic relocs needed for local syms too.
+                    We really need local syms available to do this
+                    easily.  Oh well.  */
+
+                 asection *s;
+                 s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
+                                                sec, r_symndx);
+                 if (s == NULL)
+                   return false;
 
-                 p = h->dyn_relocs;
-                 if (p == NULL || p->sec != sec)
-                   {
-                     p = ((struct elf32_hppa_dyn_reloc_entry *)
-                          bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
-                     if (p == NULL)
-                       return false;
-                     p->next = h->dyn_relocs;
-                     h->dyn_relocs = p;
-                     p->sec = sec;
-                     p->count = 0;
+                 head = ((struct elf32_hppa_dyn_reloc_entry **)
+                         &elf_section_data (s)->local_dynrel);
+               }
+
+             p = *head;
+             if (p == NULL || p->sec != sec)
+               {
+                 p = ((struct elf32_hppa_dyn_reloc_entry *)
+                      bfd_alloc (htab->elf.dynobj,
+                                 (bfd_size_type) sizeof *p));
+                 if (p == NULL)
+                   return false;
+                 p->next = *head;
+                 *head = p;
+                 p->sec = sec;
+                 p->count = 0;
 #if RELATIVE_DYNRELOCS
-                     p->relative_count = 0;
+                 p->relative_count = 0;
 #endif
-                   }
+               }
 
-                 p->count += 1;
+             p->count += 1;
 #if RELATIVE_DYNRELOCS
-                 if (!IS_ABSOLUTE_RELOC (rtype))
-                   p->relative_count += 1;
+             if (!IS_ABSOLUTE_RELOC (rtype))
+               p->relative_count += 1;
 #endif
-               }
-             else
-               {
-                 /* Track dynamic relocs needed for local syms too.  */
-                 elf_section_data (sec)->local_dynrel += 1;
-               }
            }
        }
     }
@@ -1613,13 +1638,7 @@ elf32_hppa_gc_mark_hook (abfd, info, rel, h, sym)
     }
   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 bfd_section_from_elf_index (abfd, sym->st_shndx);
     }
 
   return NULL;
@@ -1645,7 +1664,7 @@ elf32_hppa_gc_sweep_hook (abfd, info, sec, relocs)
   struct elf32_hppa_link_hash_table *htab;
   bfd *dynobj;
 
-  elf_section_data (sec)->local_dynrel = 0;
+  elf_section_data (sec)->local_dynrel = NULL;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -1767,12 +1786,22 @@ elf32_hppa_gc_sweep_hook (abfd, info, sec, relocs)
    plabels.  */
 
 static void
-elf32_hppa_hide_symbol (info, h)
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+elf32_hppa_hide_symbol (info, h, force_local)
+     struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
+     boolean force_local;
 {
-  if ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)
-    h->dynindx = -1;
+  if (force_local)
+    {
+      h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
+      if (h->dynindx != -1)
+       {
+         h->dynindx = -1;
+         _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
+                                 h->dynstr_index);
+       }
+    }
+
   if (! ((struct elf32_hppa_link_hash_entry *) h)->plabel)
     {
       h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
@@ -1802,14 +1831,11 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
 {
-  bfd *dynobj;
   struct elf32_hppa_link_hash_table *htab;
   struct elf32_hppa_link_hash_entry *eh;
   struct elf32_hppa_dyn_reloc_entry *p;
   asection *s;
-
-  htab = hppa_link_hash_table (info);
-  dynobj = htab->elf.dynobj;
+  unsigned int power_of_two;
 
   /* If this is a function, put it in the procedure linkage table.  We
      will fill in the contents of the procedure linkage table later,
@@ -1852,6 +1878,8 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
 
       return true;
     }
+  else
+    h->plt.offset = (bfd_vma) -1;
 
   /* If this is a weak symbol, and there is a real definition, the
      processor independent code will have arranged for us to see the
@@ -1863,6 +1891,7 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
        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;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -1906,39 +1935,34 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
      both the dynamic object and the regular object will refer to the
      same memory location for the variable.  */
 
-  s = htab->sdynbss;
+  htab = hppa_link_hash_table (info);
 
   /* 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.  */
+     runtime process image.  */
   if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
-      asection *srel;
-
-      srel = htab->srelbss;
-      srel->_raw_size += sizeof (Elf32_External_Rela);
+      htab->srelbss->_raw_size += sizeof (Elf32_External_Rela);
       h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
     }
 
-  {
-    /* 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;
+  /* We need to figure out the alignment required for this symbol.  I
+     have no idea how other ELF linkers handle this.  */
 
-    power_of_two = bfd_log2 (h->size);
-    if (power_of_two > 3)
-      power_of_two = 3;
+  power_of_two = bfd_log2 (h->size);
+  if (power_of_two > 3)
+    power_of_two = 3;
+
+  /* Apply the required alignment.  */
+  s = htab->sdynbss;
+  s->_raw_size = BFD_ALIGN (s->_raw_size,
+                           (bfd_size_type) (1 << power_of_two));
+  if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
+    {
+      if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
+       return false;
+    }
 
-    /* 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;
@@ -1954,7 +1978,7 @@ elf32_hppa_adjust_dynamic_symbol (info, h)
    the first part of elf32_hppa_adjust_dynamic_symbol.  */
 
 static boolean
-hppa_handle_PIC_calls (h, inf)
+mark_PIC_calls (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf ATTRIBUTE_UNUSED;
 {
@@ -1975,19 +1999,17 @@ hppa_handle_PIC_calls (h, inf)
   return true;
 }
 
-/* Allocate space in .plt, .got and associated reloc sections for
-   global syms.  */
+/* Allocate space in the .plt for entries that won't have relocations.
+   ie. pic_call and plabel entries.  */
 
 static boolean
-allocate_dynrelocs (h, inf)
+allocate_plt_static (h, inf)
      struct elf_link_hash_entry *h;
      PTR inf;
 {
   struct bfd_link_info *info;
   struct elf32_hppa_link_hash_table *htab;
   asection *s;
-  struct elf32_hppa_link_hash_entry *eh;
-  struct elf32_hppa_dyn_reloc_entry *p;
 
   if (h->root.type == bfd_link_hash_indirect
       || h->root.type == bfd_link_hash_warning)
@@ -1995,40 +2017,44 @@ allocate_dynrelocs (h, inf)
 
   info = (struct bfd_link_info *) inf;
   htab = hppa_link_hash_table (info);
-  if ((htab->elf.dynamic_sections_created
-       && h->plt.refcount > 0)
-      || ((struct elf32_hppa_link_hash_entry *) h)->pic_call)
+  if (((struct elf32_hppa_link_hash_entry *) h)->pic_call)
+    {
+      /* Make an entry in the .plt section for non-pic code that is
+        calling pic code.  */
+      s = htab->splt;
+      h->plt.offset = s->_raw_size;
+      s->_raw_size += PLT_ENTRY_SIZE;
+    }
+  else if (htab->elf.dynamic_sections_created
+          && h->plt.refcount > 0)
     {
       /* 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)
+         && h->type != STT_PARISC_MILLI)
        {
          if (! bfd_elf32_link_record_dynamic_symbol (info, h))
            return false;
        }
 
-      /* Make an entry in the .plt section.  */
-      s = htab->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)
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
+       {
+         /* Allocate these later.  */
+       }
+      else if (((struct elf32_hppa_link_hash_entry *) h)->plabel)
        {
-         /* Add some extra space for the dynamic linker to use.  */
-         s->_raw_size += PLABEL_PLT_ENTRY_SIZE;
+         /* Make an entry in the .plt section for plabel references
+            that won't have a .plt entry for other reasons.  */
+         s = htab->splt;
+         h->plt.offset = s->_raw_size;
+         s->_raw_size += 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.  */
-         htab->srelplt->_raw_size += sizeof (Elf32_External_Rela);
-         htab->need_plt_stub = 1;
+         /* No .plt entry needed.  */
+         h->plt.offset = (bfd_vma) -1;
+         h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
        }
     }
   else
@@ -2037,10 +2063,46 @@ allocate_dynrelocs (h, inf)
       h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
     }
 
-  if (h->got.refcount > 0)
+  return true;
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   global syms.  */
+
+static boolean
+allocate_dynrelocs (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf;
+{
+  struct bfd_link_info *info;
+  struct elf32_hppa_link_hash_table *htab;
+  asection *s;
+  struct elf32_hppa_link_hash_entry *eh;
+  struct elf32_hppa_dyn_reloc_entry *p;
+
+  if (h->root.type == bfd_link_hash_indirect
+      || h->root.type == bfd_link_hash_warning)
+    return true;
+
+  info = (struct bfd_link_info *) inf;
+  htab = hppa_link_hash_table (info);
+  if (htab->elf.dynamic_sections_created
+      && h->plt.offset != (bfd_vma) -1
+      && !((struct elf32_hppa_link_hash_entry *) h)->pic_call
+      && WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
     {
-      boolean dyn;
+      /* Make an entry in the .plt section.  */
+      s = htab->splt;
+      h->plt.offset = s->_raw_size;
+      s->_raw_size += PLT_ENTRY_SIZE;
+
+      /* We also need to make an entry in the .rela.plt section.  */
+      htab->srelplt->_raw_size += sizeof (Elf32_External_Rela);
+      htab->need_plt_stub = 1;
+    }
 
+  if (h->got.refcount > 0)
+    {
       /* Make sure this symbol is output as a dynamic symbol.
         Undefined weak syms won't yet be marked as dynamic.  */
       if (h->dynindx == -1
@@ -2054,9 +2116,13 @@ allocate_dynrelocs (h, inf)
       s = htab->sgot;
       h->got.offset = s->_raw_size;
       s->_raw_size += GOT_ENTRY_SIZE;
-      dyn = htab->elf.dynamic_sections_created;
-      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, h))
-       htab->srelgot->_raw_size += sizeof (Elf32_External_Rela);
+      if (htab->elf.dynamic_sections_created
+         && (info->shared
+             || (h->dynindx != -1
+                 && h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0))
+       {
+         htab->srelgot->_raw_size += sizeof (Elf32_External_Rela);
+       }
     }
   else
     h->got.offset = (bfd_vma) -1;
@@ -2122,7 +2188,7 @@ allocate_dynrelocs (h, inf)
       eh->dyn_relocs = NULL;
       return true;
 
-    keep:
+    keep: ;
     }
 
   /* Finally, allocate space.  */
@@ -2147,15 +2213,10 @@ 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)
+  if (h->type == STT_PARISC_MILLI
+      && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
     {
-      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;
+      elf32_hppa_hide_symbol (info, h, true);
     }
   return true;
 }
@@ -2226,12 +2287,10 @@ elf32_hppa_size_dynamic_sections (output_bfd, 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.  */
+        PIC, and mark them as needing .plt entries so that %r19 will
+        be set up.  */
       if (! info->shared)
-       elf_link_hash_traverse (&htab->elf,
-                               hppa_handle_PIC_calls,
-                               info);
+       elf_link_hash_traverse (&htab->elf, mark_PIC_calls, (PTR) info);
     }
 
   /* Set up .got and .plt offsets for local syms, and space for local
@@ -2251,12 +2310,28 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
 
       for (s = ibfd->sections; s != NULL; s = s->next)
        {
-         bfd_size_type count = elf_section_data (s)->local_dynrel;
+         struct elf32_hppa_dyn_reloc_entry *p;
 
-         if (count != 0)
+         for (p = ((struct elf32_hppa_dyn_reloc_entry *)
+                   elf_section_data (s)->local_dynrel);
+              p != NULL;
+              p = p->next)
            {
-             srel = elf_section_data (s)->sreloc;
-             srel->_raw_size += count * sizeof (Elf32_External_Rela);
+             if (!bfd_is_abs_section (p->sec)
+                 && bfd_is_abs_section (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 (p->count != 0)
+               {
+                 srel = elf_section_data (p->sec)->sreloc;
+                 srel->_raw_size += p->count * sizeof (Elf32_External_Rela);
+                 if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+                   info->flags |= DF_TEXTREL;
+               }
            }
        }
 
@@ -2309,6 +2384,11 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
        }
     }
 
+  /* Do all the .plt entries without relocs first.  The dynamic linker
+     uses the last .plt reloc to find the end of the .plt (and hence
+     the start of the .got) for lazy linking.  */
+  elf_link_hash_traverse (&htab->elf, allocate_plt_static, (PTR) info);
+
   /* Allocate global sym .plt and .got entries, and space for global
      sym dynamic relocs.  */
   elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, (PTR) info);
@@ -2423,7 +2503,9 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
 
          /* If any dynamic relocs apply to a read-only section,
             then we need a DT_TEXTREL entry.  */
-         elf_link_hash_traverse (&htab->elf, readonly_dynrelocs, (PTR) info);
+         if ((info->flags & DF_TEXTREL) == 0)
+           elf_link_hash_traverse (&htab->elf, readonly_dynrelocs,
+                                   (PTR) info);
 
          if ((info->flags & DF_TEXTREL) != 0)
            {
@@ -2484,11 +2566,11 @@ elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
   if (stub_group_size == 1)
     {
       /* Default values.  */
-      stub_group_size = 8000000;
+      stub_group_size = 7680000;
       if (htab->has_17bit_branch || htab->multi_subspace)
-       stub_group_size = 250000;
+       stub_group_size = 240000;
       if (htab->has_12bit_branch)
-       stub_group_size = 7812;
+       stub_group_size = 7500;
     }
 
   /* Count the number of input BFDs and find the top input section id.  */
@@ -2601,16 +2683,18 @@ elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, 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
+            than 240000 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.)
+            240000 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.  */
+            only break if stubs added total more than 22144 bytes, or
+            2768 long branch stubs.  It seems unlikely for more than
+            2768 different functions to be called, especially from
+            code only 240000 bytes long.  This limit used to be
+            250000, but c++ code tends to generate lots of little
+            functions, and sometimes violated the assumption.  */
          do
            {
              prev = PREV_SEC (tail);
@@ -2619,7 +2703,7 @@ elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
            }
          while (tail != curr && (tail = prev) != NULL);
 
-         /* But wait, there's more!  Input sections up to 250000
+         /* But wait, there's more!  Input sections up to 240000
             bytes before the stub section can be handled by it too.  */
          if (!stubs_always_before_branch)
            {
@@ -2656,8 +2740,10 @@ elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
        input_bfd = input_bfd->link_next, bfd_indx++)
     {
       Elf_Internal_Shdr *symtab_hdr;
+      Elf_Internal_Shdr *shndx_hdr;
       Elf_Internal_Sym *isym;
       Elf32_External_Sym *ext_syms, *esym, *end_sy;
+      Elf_External_Sym_Shndx *shndx_buf, *shndx;
       bfd_size_type sec_size;
 
       /* We'll need the symbol table in a second.  */
@@ -2671,32 +2757,50 @@ elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
       sec_size *= sizeof (Elf_Internal_Sym);
       local_syms = (Elf_Internal_Sym *) bfd_malloc (sec_size);
       if (local_syms == NULL)
-       {
-         goto error_ret_free_local;
-       }
+       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;
-       }
+       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))
+         || bfd_bread ((PTR) ext_syms, sec_size, input_bfd) != sec_size)
        {
+       error_ret_free_ext_syms:
          free (ext_syms);
          goto error_ret_free_local;
        }
 
+      shndx_buf = NULL;
+      shndx_hdr = &elf_tdata (input_bfd)->symtab_shndx_hdr;
+      if (shndx_hdr->sh_size != 0)
+       {
+         sec_size = symtab_hdr->sh_info;
+         sec_size *= sizeof (Elf_External_Sym_Shndx);
+         shndx_buf = (Elf_External_Sym_Shndx *) bfd_malloc (sec_size);
+         if (shndx_buf == NULL)
+           goto error_ret_free_ext_syms;
+
+         if (bfd_seek (input_bfd, shndx_hdr->sh_offset, SEEK_SET) != 0
+             || bfd_bread ((PTR) shndx_buf, sec_size, input_bfd) != sec_size)
+           {
+             free (shndx_buf);
+             goto error_ret_free_ext_syms;
+           }
+       }
+
       /* 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);
+      for (esym = ext_syms, end_sy = esym + symtab_hdr->sh_info,
+            isym = local_syms, shndx = shndx_buf;
+          esym < end_sy;
+          esym++, isym++, shndx = (shndx ? shndx + 1 : NULL))
+       bfd_elf32_swap_symbol_in (input_bfd, esym, shndx, isym);
 
       /* Now we can free the external symbols.  */
+      free (shndx_buf);
       free (ext_syms);
 
       if (info->shared && htab->multi_subspace)
@@ -2829,9 +2933,9 @@ elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
              /* 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)
+                 || bfd_bread ((PTR) external_relocs,
+                               input_rel_hdr->sh_size,
+                               input_bfd) != input_rel_hdr->sh_size)
                {
                  free (external_relocs);
                error_ret_free_internal:
@@ -2934,7 +3038,8 @@ elf32_hppa_size_stubs (output_bfd, stub_bfd, info, multi_subspace, group_size,
                          if (! (info->shared
                                 && !info->no_undefined
                                 && (ELF_ST_VISIBILITY (hash->elf.other)
-                                    == STV_DEFAULT)))
+                                    == STV_DEFAULT)
+                                && hash->elf.type != STT_PARISC_MILLI))
                            continue;
                        }
                      else
@@ -3287,7 +3392,7 @@ final_link_relocate (input_section, contents, rel, value, htab, sym_sec, h)
              addend = 8;
            }
          else
-           return bfd_reloc_notsupported;
+           return bfd_reloc_undefined;
        }
       /* Fall thru.  */
 
@@ -3366,21 +3471,27 @@ final_link_relocate (input_section, contents, rel, value, htab, sym_sec, h)
       r_field = e_fsel;
       break;
 
-    case R_PARISC_DIR21L:
+    case R_PARISC_DLTIND21L:
     case R_PARISC_PCREL21L:
-    case R_PARISC_DPREL21L:
     case R_PARISC_PLABEL21L:
-    case R_PARISC_DLTIND21L:
+      r_field = e_lsel;
+      break;
+
+    case R_PARISC_DIR21L:
+    case R_PARISC_DPREL21L:
       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_rsel;
+      break;
+
+    case R_PARISC_DIR17R:
+    case R_PARISC_DIR14R:
+    case R_PARISC_DPREL14R:
       r_field = e_rrsel;
       break;
 
@@ -3415,7 +3526,7 @@ final_link_relocate (input_section, contents, rel, value, htab, sym_sec, h)
          stub_entry = hppa_get_stub_entry (input_section, sym_sec,
                                            h, rel, htab);
          if (stub_entry == NULL)
-           return bfd_reloc_notsupported;
+           return bfd_reloc_undefined;
 
          /* Munge up the value and addend so that we call the stub
             rather than the procedure directly.  */
@@ -3442,6 +3553,7 @@ final_link_relocate (input_section, contents, rel, value, htab, sym_sec, h)
         input_section->name,
         (long) rel->r_offset,
         stub_entry->root.string);
+      bfd_set_error (bfd_error_bad_value);
       return bfd_reloc_notsupported;
     }
 
@@ -3488,7 +3600,6 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
      Elf_Internal_Sym *local_syms;
      asection **local_sections;
 {
-  bfd *dynobj;
   bfd_vma *local_got_offsets;
   struct elf32_hppa_link_hash_table *htab;
   Elf_Internal_Shdr *symtab_hdr;
@@ -3498,7 +3609,6 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
 
   htab = hppa_link_hash_table (info);
-  dynobj = htab->elf.dynobj;
   local_got_offsets = elf_local_got_offsets (input_bfd);
 
   rel = relocs;
@@ -3515,7 +3625,7 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
       bfd_reloc_status_type r;
       const char *sym_name;
       boolean plabel;
-      bfd_vma off;
+      boolean warned_undef;
 
       r_type = ELF32_R_TYPE (rel->r_info);
       if (r_type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
@@ -3531,7 +3641,7 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 
       if (info->relocateable)
        {
-         /* This is a relocateable link.  We don't have to change
+         /* This is a relocatable 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.  */
@@ -3551,15 +3661,13 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
       h = NULL;
       sym = NULL;
       sym_sec = NULL;
+      warned_undef = false;
       if (r_symndx < symtab_hdr->sh_info)
        {
          /* 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);
+         relocation = _bfd_elf_rela_local_sym (output_bfd, sym, sym_sec, rel);
        }
       else
        {
@@ -3592,10 +3700,13 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
                   && h->elf.type != STT_PARISC_MILLI)
            {
              if (info->symbolic && !info->allow_shlib_undefined)
-               if (!((*info->callbacks->undefined_symbol)
-                     (info, h->elf.root.root.string, input_bfd,
-                      input_section, rel->r_offset, false)))
-                 return false;
+               {
+                 if (!((*info->callbacks->undefined_symbol)
+                       (info, h->elf.root.root.string, input_bfd,
+                        input_section, rel->r_offset, false)))
+                   return false;
+                 warned_undef = true;
+               }
            }
          else
            {
@@ -3603,6 +3714,7 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
                    (info, h->elf.root.root.string, input_bfd,
                     input_section, rel->r_offset, true)))
                return false;
+             warned_undef = true;
            }
        }
 
@@ -3615,88 +3727,88 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
        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)
-           {
-             boolean dyn;
-
-             off = h->elf.got.offset;
-             dyn = htab->elf.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,
-                                 htab->sgot->contents + off);
-                     h->elf.got.offset |= 1;
-                   }
-               }
-           }
-         else
-           {
-             /* Local symbol case.  */
-             if (local_got_offsets == NULL)
-               abort ();
-
-             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_vma off;
+           boolean do_got = 0;
+
+           /* Relocation is to the entry for this symbol in the
+              global offset table.  */
+           if (h != NULL)
+             {
+               boolean dyn;
+
+               off = h->elf.got.offset;
+               dyn = htab->elf.dynamic_sections_created;
+               if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, &h->elf))
+                 {
+                   /* If we aren't going to call finish_dynamic_symbol,
+                      then we need to handle initialisation of the .got
+                      entry and create needed relocs here.  Since the
+                      offset must always be a multiple of 4, we use the
+                      least significant bit to record whether we have
+                      initialised it already.  */
+                   if ((off & 1) != 0)
+                     off &= ~1;
+                   else
+                     {
+                       h->elf.got.offset |= 1;
+                       do_got = 1;
+                     }
+                 }
+             }
+           else
+             {
+               /* Local symbol case.  */
+               if (local_got_offsets == NULL)
+                 abort ();
+
+               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
+                 {
+                   local_got_offsets[r_symndx] |= 1;
+                   do_got = 1;
+                 }
+             }
+
+           if (do_got)
+             {
+               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 = htab->srelgot;
+                   Elf32_External_Rela *loc;
+
+                   outrel.r_offset = (off
+                                      + htab->sgot->output_offset
+                                      + htab->sgot->output_section->vma);
+                   outrel.r_info = ELF32_R_INFO (0, R_PARISC_DIR32);
+                   outrel.r_addend = relocation;
+                   loc = (Elf32_External_Rela *) srelgot->contents;
+                   loc += srelgot->reloc_count++;
+                   bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+                 }
+               else
                  bfd_put_32 (output_bfd, relocation,
                              htab->sgot->contents + off);
+             }
 
-                 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 = htab->srelgot;
-
-                     outrel.r_offset = (off
-                                        + htab->sgot->output_offset
-                                        + htab->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;
-                   }
-
-                 local_got_offsets[r_symndx] |= 1;
-               }
-           }
-
-         if (off >= (bfd_vma) -2)
-           abort ();
+           if (off >= (bfd_vma) -2)
+             abort ();
 
-         /* Add the base of the GOT to the relocation value.  */
-         relocation = (off
-                       + htab->sgot->output_offset
-                       + htab->sgot->output_section->vma);
+           /* Add the base of the GOT to the relocation value.  */
+           relocation = (off
+                         + htab->sgot->output_offset
+                         + htab->sgot->output_section->vma);
+         }
          break;
 
        case R_PARISC_SEGREL32:
@@ -3711,6 +3823,9 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
        case R_PARISC_PLABEL32:
          if (htab->elf.dynamic_sections_created)
            {
+             bfd_vma off;
+             boolean do_plt = 0;
+
              /* If we have a global symbol with a PLT slot, then
                 redirect this relocation to it.  */
              if (h != NULL)
@@ -3725,13 +3840,8 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
                        off &= ~1;
                      else
                        {
-                         bfd_put_32 (output_bfd,
-                                     relocation,
-                                     htab->splt->contents + off);
-                         bfd_put_32 (output_bfd,
-                                     elf_gp (htab->splt->output_section->owner),
-                                     htab->splt->contents + off + 4);
                          h->elf.plt.offset |= 1;
+                         do_plt = 1;
                        }
                    }
                }
@@ -3750,6 +3860,32 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
                     this local .plt entry.  */
                  if ((off & 1) != 0)
                    off &= ~1;
+                 else
+                   {
+                     local_plt_offsets[r_symndx] |= 1;
+                     do_plt = 1;
+                   }
+               }
+
+             if (do_plt)
+               {
+                 if (info->shared)
+                   {
+                     /* Output a dynamic IPLT relocation for this
+                        PLT entry.  */
+                     Elf_Internal_Rela outrel;
+                     asection *srelplt = htab->srelplt;
+                     Elf32_External_Rela *loc;
+
+                     outrel.r_offset = (off
+                                        + htab->splt->output_offset
+                                        + htab->splt->output_section->vma);
+                     outrel.r_info = ELF32_R_INFO (0, R_PARISC_IPLT);
+                     outrel.r_addend = relocation;
+                     loc = (Elf32_External_Rela *) srelplt->contents;
+                     loc += srelplt->reloc_count++;
+                     bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+                   }
                  else
                    {
                      bfd_put_32 (output_bfd,
@@ -3758,27 +3894,6 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
                      bfd_put_32 (output_bfd,
                                  elf_gp (htab->splt->output_section->owner),
                                  htab->splt->contents + off + 4);
-
-                     if (info->shared)
-                       {
-                         /* Output a dynamic IPLT relocation for this
-                            PLT entry.  */
-                         Elf_Internal_Rela outrel;
-                         asection *srelplt = htab->srelplt;
-
-                         outrel.r_offset = (off
-                                            + htab->splt->output_offset
-                                            + htab->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;
-                       }
-
-                     local_plt_offsets[r_symndx] |= 1;
                    }
                }
 
@@ -3813,12 +3928,19 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
        case R_PARISC_DPREL14R:
        case R_PARISC_DPREL21L:
        case R_PARISC_DIR32:
+         /* r_symndx will be zero only for relocs against symbols
+            from removed linkonce sections, or sections discarded by
+            a linker script.  */
+         if (r_symndx == 0
+             || (input_section->flags & SEC_ALLOC) == 0)
+           break;
+
          /* 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
+            allocate_dynrelocs.  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
+            allocate_dynrelocs.  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,
@@ -3826,7 +3948,6 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
             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
@@ -3834,7 +3955,6 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
                           || (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
@@ -3854,21 +3974,12 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
                 are copied into the output file to be resolved at run
                 time.  */
 
-             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, &htab->elf.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 =
+               _bfd_elf_section_offset (output_bfd, info, input_section,
+                                        rel->r_offset);
+             skip = (outrel.r_offset == (bfd_vma) -1
+                     || outrel.r_offset == (bfd_vma) -2);
              outrel.r_offset += (input_section->output_offset
                                  + input_section->output_section->vma);
 
@@ -3926,9 +4037,8 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
              if (sreloc == NULL)
                abort ();
 
-             loc = ((Elf32_External_Rela *) sreloc->contents
-                    + sreloc->reloc_count);
-             sreloc->reloc_count += 1;
+             loc = (Elf32_External_Rela *) sreloc->contents;
+             loc += sreloc->reloc_count++;
              bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
            }
          break;
@@ -3960,15 +4070,18 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
 
       if (r == bfd_reloc_undefined || r == bfd_reloc_notsupported)
        {
-         (*_bfd_error_handler)
-           (_("%s(%s+0x%lx): cannot handle %s for %s"),
-            bfd_archive_filename (input_bfd),
-            input_section->name,
-            (long) rel->r_offset,
-            howto->name,
-            sym_name);
-         bfd_set_error (bfd_error_bad_value);
-         return false;
+         if (r == bfd_reloc_notsupported || !warned_undef)
+           {
+             (*_bfd_error_handler)
+               (_("%s(%s+0x%lx): cannot handle %s for %s"),
+                bfd_archive_filename (input_bfd),
+                input_section->name,
+                (long) rel->r_offset,
+                howto->name,
+                sym_name);
+             bfd_set_error (bfd_error_bad_value);
+             return false;
+           }
        }
       else
        {
@@ -4019,10 +4132,8 @@ elf32_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
      Elf_Internal_Sym *sym;
 {
   struct elf32_hppa_link_hash_table *htab;
-  bfd *dynobj;
 
   htab = hppa_link_hash_table (info);
-  dynobj = htab->elf.dynobj;
 
   if (h->plt.offset != (bfd_vma) -1)
     {
@@ -4051,23 +4162,14 @@ elf32_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
       if (! ((struct elf32_hppa_link_hash_entry *) h)->pic_call)
        {
          Elf_Internal_Rela rel;
+         Elf32_External_Rela *loc;
 
          /* Create a dynamic IPLT relocation for this entry.  */
          rel.r_offset = (h->plt.offset
                          + htab->splt->output_offset
                          + htab->splt->output_section->vma);
-         if (! ((struct elf32_hppa_link_hash_entry *) h)->plt_abs
-             && h->dynindx != -1)
+         if (h->dynindx != -1)
            {
-             /* 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 = (htab->splt->output_offset
-                      + htab->splt->output_section->vma
-                      + htab->splt->_raw_size
-                      - sizeof (plt_stub)
-                      + PLT_STUB_ENTRY);
              rel.r_info = ELF32_R_INFO (h->dynindx, R_PARISC_IPLT);
              rel.r_addend = 0;
            }
@@ -4079,26 +4181,19 @@ elf32_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
              rel.r_addend = value;
            }
 
+         loc = (Elf32_External_Rela *) htab->srelplt->contents;
+         loc += htab->srelplt->reloc_count++;
          bfd_elf32_swap_reloca_out (htab->splt->output_section->owner,
-                                    &rel,
-                                    ((Elf32_External_Rela *)
-                                     htab->srelplt->contents
-                                     + htab->srelplt->reloc_count));
-         htab->srelplt->reloc_count++;
+                                    &rel, loc);
        }
-
-      bfd_put_32 (htab->splt->owner,
-                 value,
-                 htab->splt->contents + h->plt.offset);
-      bfd_put_32 (htab->splt->owner,
-                 elf_gp (htab->splt->output_section->owner),
-                 htab->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)
+      else
        {
-         memset (htab->splt->contents + h->plt.offset + 8,
-                 0, PLABEL_PLT_ENTRY_SIZE - PLT_ENTRY_SIZE);
+         bfd_put_32 (htab->splt->owner,
+                     value,
+                     htab->splt->contents + h->plt.offset);
+         bfd_put_32 (htab->splt->owner,
+                     elf_gp (htab->splt->output_section->owner),
+                     htab->splt->contents + h->plt.offset + 4);
        }
 
       if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
@@ -4112,6 +4207,7 @@ elf32_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
   if (h->got.offset != (bfd_vma) -1)
     {
       Elf_Internal_Rela rel;
+      Elf32_External_Rela *loc;
 
       /* This symbol has an entry in the global offset table.  Set it
         up.  */
@@ -4144,17 +4240,16 @@ elf32_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
          rel.r_addend = 0;
        }
 
-      bfd_elf32_swap_reloca_out (output_bfd, &rel,
-                                ((Elf32_External_Rela *)
-                                 htab->srelgot->contents
-                                 + htab->srelgot->reloc_count));
-      ++htab->srelgot->reloc_count;
+      loc = (Elf32_External_Rela *) htab->srelgot->contents;
+      loc += htab->srelgot->reloc_count++;
+      bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
     }
 
   if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
     {
       asection *s;
       Elf_Internal_Rela rel;
+      Elf32_External_Rela *loc;
 
       /* This symbol needs a copy reloc.  Set it up.  */
 
@@ -4170,10 +4265,8 @@ elf32_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
                      + 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;
+      loc = (Elf32_External_Rela *) s->contents + s->reloc_count++;
+      bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
     }
 
   /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
@@ -4243,18 +4336,16 @@ elf32_hppa_finish_dynamic_sections (output_bfd, info)
          switch (dyn.d_tag)
            {
            default:
-             break;
+             continue;
 
            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;
 
            case DT_JMPREL:
              s = htab->srelplt;
              dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
-             bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
              break;
 
            case DT_PLTRELSZ:
@@ -4263,9 +4354,23 @@ elf32_hppa_finish_dynamic_sections (output_bfd, info)
                dyn.d_un.d_val = s->_cooked_size;
              else
                dyn.d_un.d_val = s->_raw_size;
-             bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+             break;
+
+           case DT_RELASZ:
+             /* Don't count procedure linkage table relocs in the
+                overall reloc count.  */
+             if (htab->srelplt != NULL)
+               {
+                 s = htab->srelplt->output_section;
+                 if (s->_cooked_size != 0)
+                   dyn.d_un.d_val -= s->_cooked_size;
+                 else
+                   dyn.d_un.d_val -= s->_raw_size;
+               }
              break;
            }
+
+         bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
        }
     }
 
@@ -4379,6 +4484,7 @@ elf32_hppa_elf_get_symbol_type (elf_sym, type)
 #define elf_backend_reloc_type_class        elf32_hppa_reloc_type_class
 
 #define elf_backend_can_gc_sections         1
+#define elf_backend_can_refcount            1
 #define elf_backend_plt_alignment           2
 #define elf_backend_want_got_plt            0
 #define elf_backend_plt_readonly            0
This page took 0.043089 seconds and 4 git commands to generate.