* elf.c (_bfd_elf_rela_local_sym): New.
[deliverable/binutils-gdb.git] / bfd / elf32-hppa.c
index 1417023743814017010198adbdbb468503fda581..9f1357691a34a2198d6336c8d4ddb34399466632 100644 (file)
@@ -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.  */
@@ -342,7 +340,10 @@ static void elf32_hppa_hide_symbol
 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;
 }
@@ -1516,6 +1517,9 @@ 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)
@@ -1563,36 +1567,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 (htab->elf.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;
-               }
            }
        }
     }
@@ -1668,7 +1682,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);
@@ -1972,7 +1986,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;
 {
@@ -1993,19 +2007,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)
@@ -2013,46 +2025,42 @@ 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;
        }
 
-      if (((struct elf32_hppa_link_hash_entry *) h)->pic_call
-         || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
        {
-         /* Make an entry in the .plt section.  */
+         /* Allocate these later.  */
+       }
+      else if (((struct elf32_hppa_link_hash_entry *) h)->plabel)
+       {
+         /* 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;
-         if (PLABEL_PLT_ENTRY_SIZE != PLT_ENTRY_SIZE
-             && ((struct elf32_hppa_link_hash_entry *) h)->plabel
-             && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
-           {
-             /* Add some extra space for the dynamic linker to use.  */
-             s->_raw_size += PLABEL_PLT_ENTRY_SIZE;
-           }
-         else
-           s->_raw_size += PLT_ENTRY_SIZE;
-
-         if (! ((struct elf32_hppa_link_hash_entry *) h)->pic_call)
-           {
-             /* 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;
-           }
+         s->_raw_size += PLT_ENTRY_SIZE;
        }
       else
        {
+         /* No .plt entry needed.  */
          h->plt.offset = (bfd_vma) -1;
          h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
        }
@@ -2063,10 +2071,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
@@ -2080,9 +2124,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;
@@ -2148,7 +2196,7 @@ allocate_dynrelocs (h, inf)
       eh->dyn_relocs = NULL;
       return true;
 
-    keep:
+    keep: ;
     }
 
   /* Finally, allocate space.  */
@@ -2177,9 +2225,13 @@ clobber_millicode_symbols (h, info)
      Therefore we do not leave ELF_LINK_FORCED_LOCAL set.  */
   if (h->type == STT_PARISC_MILLI)
     {
+      struct elf32_hppa_link_hash_table *htab;
       unsigned short oldflags = h->elf_link_hash_flags;
+
       h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
       elf32_hppa_hide_symbol (info, h);
+      htab = hppa_link_hash_table (info);
+      _bfd_elf_strtab_delref (htab->elf.dynstr, h->dynstr_index);
       h->elf_link_hash_flags &= ~ELF_LINK_FORCED_LOCAL;
       h->elf_link_hash_flags |= oldflags & ELF_LINK_FORCED_LOCAL;
     }
@@ -2252,12 +2304,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
@@ -2277,12 +2327,26 @@ 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
+               {
+                 srel = elf_section_data (p->sec)->sreloc;
+                 srel->_raw_size += p->count * sizeof (Elf32_External_Rela);
+               }
            }
        }
 
@@ -2335,6 +2399,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);
@@ -2960,7 +3029,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
@@ -3468,6 +3538,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;
     }
 
@@ -3539,7 +3610,6 @@ 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;
 
       r_type = ELF32_R_TYPE (rel->r_info);
       if (r_type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
@@ -3580,10 +3650,7 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
          /* 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
        {
@@ -3639,87 +3706,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];
+         {
+           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;
+                 }
+             }
 
-             /* 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
-               {
+           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;
-                     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);
-                   }
+           if (off >= (bfd_vma) -2)
+             abort ();
 
-                 local_got_offsets[r_symndx] |= 1;
-               }
-           }
-
-         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:
@@ -3734,6 +3802,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)
@@ -3748,13 +3819,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;
                        }
                    }
                }
@@ -3773,6 +3839,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,
@@ -3781,26 +3873,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;
-                         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);
-                       }
-
-                     local_plt_offsets[r_symndx] |= 1;
                    }
                }
 
@@ -3835,12 +3907,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,
@@ -3848,7 +3927,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
@@ -3856,7 +3934,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
@@ -3881,6 +3958,8 @@ elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
              skip = false;
              if (elf_section_data (input_section)->stab_info != NULL)
                {
+                 bfd_vma off;
+
                  off = (_bfd_stab_section_offset
                         (output_bfd, &htab->elf.stab_info,
                          input_section,
@@ -4076,18 +4155,8 @@ elf32_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
          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;
            }
@@ -4104,19 +4173,14 @@ elf32_hppa_finish_dynamic_symbol (output_bfd, info, h, sym)
          bfd_elf32_swap_reloca_out (htab->splt->output_section->owner,
                                     &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)
@@ -4278,6 +4342,19 @@ elf32_hppa_finish_dynamic_sections (output_bfd, info)
              else
                dyn.d_un.d_val = s->_raw_size;
              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);
This page took 0.033346 seconds and 4 git commands to generate.