2014-03-12  Aldy Hernandez  <aldyh@redhat.com>

    Copy over bfd/elf64-ppc.c from upstream binutils-2_24-branch.

    Additional supporting changes to get elf64-ppc.c to build (tests,

    header files, etc).

diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h

index 4688ddd..34ad362 100644

--- a/bfd/elf-bfd.h

+++ b/bfd/elf-bfd.h

@@ -643,7 +643,8 @@ enum elf_reloc_type_class {

   reloc_class_normal,

   reloc_class_relative,

   reloc_class_plt,

-  reloc_class_copy

+  reloc_class_copy,

+  reloc_class_ifunc

 };

 struct elf_reloc_cookie

@@ -1130,7 +1131,7 @@ struct elf_backend_data

   /* This function returns class of a reloc type.  */

   enum elf_reloc_type_class (*elf_backend_reloc_type_class)

-    (const Elf_Internal_Rela *);

+  (const struct bfd_link_info *, const asection *, const Elf_Internal_Rela *);

   /* This function, if defined, removes information about discarded functions

      from other sections which mention them.  */

@@ -1788,7 +1789,8 @@ extern bfd_boolean _bfd_elf_can_make_relative

   (bfd *input_bfd, struct bfd_link_info *info, asection *eh_frame_section);

 extern enum elf_reloc_type_class _bfd_elf_reloc_type_class

-  (const Elf_Internal_Rela *);

+  (const struct bfd_link_info *, const asection *,

+   const Elf_Internal_Rela *);

 extern bfd_vma _bfd_elf_rela_local_sym

   (bfd *, Elf_Internal_Sym *, asection **, Elf_Internal_Rela *);

 extern bfd_vma _bfd_elf_rel_local_sym

@@ -2156,6 +2158,8 @@ extern bfd_boolean _bfd_elf_default_relocs_compatible

 extern bfd_boolean _bfd_elf_relocs_compatible

   (const bfd_target *, const bfd_target *);

+extern bfd_boolean _bfd_elf_notice_as_needed

+(bfd *, struct bfd_link_info *, enum notice_asneeded_action);

 extern struct elf_link_hash_entry *_bfd_elf_archive_symbol_lookup

   (bfd *, struct bfd_link_info *, const char *);

diff --git a/bfd/elf.c b/bfd/elf.c

index dcbd50a..661fcc4 100644

--- a/bfd/elf.c

+++ b/bfd/elf.c

@@ -9877,7 +9877,9 @@ bfd_get_elf_phdrs (bfd *abfd, void *phdrs)

 }

 enum elf_reloc_type_class

-_bfd_elf_reloc_type_class (const Elf_Internal_Rela *rela ATTRIBUTE_UNUSED)

+_bfd_elf_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED,

+			   const asection *rel_sec ATTRIBUTE_UNUSED,

+			   const Elf_Internal_Rela *rela ATTRIBUTE_UNUSED)

 {

   return reloc_class_normal;

 }

diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c

index a3680f2..2082441 100644

--- a/bfd/elf32-ppc.c

+++ b/bfd/elf32-ppc.c

@@ -9349,8 +9349,15 @@ ppc_elf_finish_dynamic_symbol (bfd *output_bfd,

 }

 static enum elf_reloc_type_class

-ppc_elf_reloc_type_class (const Elf_Internal_Rela *rela)

+ppc_elf_reloc_type_class (const struct bfd_link_info *info,

+                          const asection *rel_sec,

+			  const Elf_Internal_Rela *rela)

 {

+  struct ppc_elf_link_hash_table *htab = ppc_elf_hash_table (info);

+

+  if (rel_sec == htab->reliplt)

+    return reloc_class_ifunc;

+

   switch (ELF32_R_TYPE (rela->r_info))

     {

     case R_PPC_RELATIVE:

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c

index 80c2a4d..6ae78f3 100644

--- a/bfd/elf64-ppc.c

+++ b/bfd/elf64-ppc.c

@@ -97,7 +97,7 @@ static bfd_vma opd_entry_value

 #define elf_backend_copy_indirect_symbol      ppc64_elf_copy_indirect_symbol

 #define elf_backend_add_symbol_hook	      ppc64_elf_add_symbol_hook

 #define elf_backend_check_directives	      ppc64_elf_process_dot_syms

-#define elf_backend_as_needed_cleanup	      ppc64_elf_as_needed_cleanup

+#define elf_backend_notice_as_needed	      ppc64_elf_notice_as_needed

 #define elf_backend_archive_symbol_lookup     ppc64_elf_archive_symbol_lookup

 #define elf_backend_check_relocs	      ppc64_elf_check_relocs

 #define elf_backend_gc_keep		      ppc64_elf_gc_keep

@@ -134,7 +134,7 @@ static bfd_vma opd_entry_value

 /* Offsets to some stack save slots.  */

 #define STK_LR 16

 #define STK_TOC(htab) (htab->opd_abi ? 40 : 24)

-/* This one is dodgy.  ABIv2 does not have a linker word, so use the

+/* This one is dodgy.  ELFv2 does not have a linker word, so use the

    CR save slot.  Used only by optimised __tls_get_addr call stub,

    relying on __tls_get_addr_opt not saving CR..  */

 #define STK_LINKER(htab) (htab->opd_abi ? 32 : 8)

@@ -2592,7 +2592,7 @@ ppc64_elf_toc_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,

   TOCstart = _bfd_get_gp_value (input_section->output_section->owner);

   if (TOCstart == 0)

-    TOCstart = ppc64_elf_toc (input_section->output_section->owner);

+    TOCstart = ppc64_elf_set_toc (NULL, input_section->output_section->owner);

   /* Subtract the TOC base address.  */

   reloc_entry->addend -= TOCstart + TOC_BASE_OFF;

@@ -2615,7 +2615,7 @@ ppc64_elf_toc_ha_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,

   TOCstart = _bfd_get_gp_value (input_section->output_section->owner);

   if (TOCstart == 0)

-    TOCstart = ppc64_elf_toc (input_section->output_section->owner);

+    TOCstart = ppc64_elf_set_toc (NULL, input_section->output_section->owner);

   /* Subtract the TOC base address.  */

   reloc_entry->addend -= TOCstart + TOC_BASE_OFF;

@@ -2642,7 +2642,7 @@ ppc64_elf_toc64_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,

   TOCstart = _bfd_get_gp_value (input_section->output_section->owner);

   if (TOCstart == 0)

-    TOCstart = ppc64_elf_toc (input_section->output_section->owner);

+    TOCstart = ppc64_elf_set_toc (NULL, input_section->output_section->owner);

   octets = reloc_entry->address * bfd_octets_per_byte (abfd);

   bfd_put_64 (abfd, TOCstart + TOC_BASE_OFF, (bfd_byte *) data + octets);

@@ -2735,8 +2735,13 @@ struct ppc64_elf_obj_tdata

      sections means we potentially need one of these for each input bfd.  */

   struct got_entry tlsld_got;

-  /* A copy of relocs before they are modified for --emit-relocs.  */

-  Elf_Internal_Rela *opd_relocs;

+  union {

+    /* A copy of relocs before they are modified for --emit-relocs.  */

+    Elf_Internal_Rela *relocs;

+

+    /* Section contents.  */

+    bfd_byte *contents;

+  } opd;

   /* Nonzero if this bfd has small toc/got relocs, ie. that expect

      the reloc to be in the range -32768 to 32767.  */

@@ -3768,9 +3773,6 @@ struct ppc_stub_hash_entry {

   struct ppc_link_hash_entry *h;

   struct plt_entry *plt_ent;

-  /* And the reloc addend that this was derived from.  */

-  bfd_vma addend;

-

   /* Where this stub is being called from, or, in the case of combined

      stub sections, the first input section in the group.  */

   asection *id_sec;

@@ -3791,6 +3793,21 @@ struct ppc_branch_hash_entry {

   unsigned int iter;

 };

+/* Used to track dynamic relocations for local symbols.  */

+struct ppc_dyn_relocs

+{

+  struct ppc_dyn_relocs *next;

+

+  /* The input section of the reloc.  */

+  asection *sec;

+

+  /* Total number of relocs copied for the input section.  */

+  unsigned int count : 31;

+

+  /* Whether this entry is for STT_GNU_IFUNC symbols.  */

+  unsigned int ifunc : 1;

+};

+

 struct ppc_link_hash_entry

 {

   struct elf_link_hash_entry elf;

@@ -3892,12 +3909,7 @@ struct ppc_link_hash_table

   /* List of input sections for each output section.  */

   asection **input_list;

-  /* Short-cuts to get to dynamic linker sections.  */

-  asection *got;

-  asection *plt;

-  asection *relplt;

-  asection *iplt;

-  asection *reliplt;

+  /* Shortcuts to get to dynamic linker sections.  */

   asection *dynbss;

   asection *relbss;

   asection *glink;

@@ -3910,9 +3922,6 @@ struct ppc_link_hash_table

   struct ppc_link_hash_entry *tls_get_addr;

   struct ppc_link_hash_entry *tls_get_addr_fd;

-  /* The special .TOC. symbol.  */

-  struct ppc_link_hash_entry *dot_toc_dot;

-

   /* The size of reliplt used by got entry relocs.  */

   bfd_size_type got_reli_size;

@@ -4204,9 +4213,85 @@ ppc64_elf_link_hash_table_free (struct bfd_link_hash_table *hash)

   _bfd_elf_link_hash_table_free (hash);

 }

+/* Create sections for linker generated code.  */

+

+static bfd_boolean

+create_linkage_sections (bfd *dynobj, struct bfd_link_info *info)

+{

+  struct ppc_link_hash_table *htab;

+  flagword flags;

+

+  htab = ppc_hash_table (info);

+

+  /* Create .sfpr for code to save and restore fp regs.  */

+  flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_READONLY

+	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);

+  htab->sfpr = bfd_make_section_anyway_with_flags (dynobj, ".sfpr",

+						   flags);

+  if (htab->sfpr == NULL

+      || ! bfd_set_section_alignment (dynobj, htab->sfpr, 2))

+    return FALSE;

+

+  /* Create .glink for lazy dynamic linking support.  */

+  htab->glink = bfd_make_section_anyway_with_flags (dynobj, ".glink",

+						    flags);

+  if (htab->glink == NULL

+      || ! bfd_set_section_alignment (dynobj, htab->glink, 3))

+    return FALSE;

+

+  if (!info->no_ld_generated_unwind_info)

+    {

+      flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_HAS_CONTENTS

+	       | SEC_IN_MEMORY | SEC_LINKER_CREATED);

+      htab->glink_eh_frame = bfd_make_section_anyway_with_flags (dynobj,

+								 ".eh_frame",

+								 flags);

+      if (htab->glink_eh_frame == NULL

+	  || !bfd_set_section_alignment (dynobj, htab->glink_eh_frame, 2))

+	return FALSE;

+    }

+

+  flags = SEC_ALLOC | SEC_LINKER_CREATED;

+  htab->elf.iplt = bfd_make_section_anyway_with_flags (dynobj, ".iplt", flags);

+  if (htab->elf.iplt == NULL

+      || ! bfd_set_section_alignment (dynobj, htab->elf.iplt, 3))

+    return FALSE;

+

+  flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY

+	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);

+  htab->elf.irelplt

+    = bfd_make_section_anyway_with_flags (dynobj, ".rela.iplt", flags);

+  if (htab->elf.irelplt == NULL

+      || ! bfd_set_section_alignment (dynobj, htab->elf.irelplt, 3))

+    return FALSE;

+

+  /* Create branch lookup table for plt_branch stubs.  */

+  flags = (SEC_ALLOC | SEC_LOAD

+	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);

+  htab->brlt = bfd_make_section_anyway_with_flags (dynobj, ".branch_lt",

+						   flags);

+  if (htab->brlt == NULL

+      || ! bfd_set_section_alignment (dynobj, htab->brlt, 3))

+    return FALSE;

+

+  if (!info->shared)

+    return TRUE;

+

+  flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY

+	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);

+  htab->relbrlt = bfd_make_section_anyway_with_flags (dynobj,

+						      ".rela.branch_lt",

+						      flags);

+  if (htab->relbrlt == NULL

+      || ! bfd_set_section_alignment (dynobj, htab->relbrlt, 3))

+    return FALSE;

+

+  return TRUE;

+}

+

 /* Satisfy the ELF linker by filling in some fields in our fake bfd.  */

-void

+bfd_boolean

 ppc64_elf_init_stub_bfd (bfd *abfd, struct bfd_link_info *info)

 {

   struct ppc_link_hash_table *htab;

@@ -4218,9 +4303,14 @@ ppc64_elf_init_stub_bfd (bfd *abfd, struct bfd_link_info *info)

    the start of the output TOC section.  */

   htab = ppc_hash_table (info);

   if (htab == NULL)

-    return;

+    return FALSE;

   htab->stub_bfd = abfd;

   htab->elf.dynobj = abfd;

+

+  if (info->relocatable)

+    return TRUE;

+

+  return create_linkage_sections (htab->elf.dynobj, info);

 }

 /* Build a name for an entry in the stub hash table.  */

@@ -4370,85 +4460,6 @@ ppc_add_stub (const char *stub_name,

   return stub_entry;

 }

-/* Create sections for linker generated code.  */

-

-static bfd_boolean

-create_linkage_sections (bfd *dynobj, struct bfd_link_info *info)

-{

-  struct ppc_link_hash_table *htab;

-  flagword flags;

-

-  htab = ppc_hash_table (info);

-  if (htab == NULL)

-    return FALSE;

-

-  /* Create .sfpr for code to save and restore fp regs.  */

-  flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_READONLY

-	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);

-  htab->sfpr = bfd_make_section_anyway_with_flags (dynobj, ".sfpr",

-						   flags);

-  if (htab->sfpr == NULL

-      || ! bfd_set_section_alignment (dynobj, htab->sfpr, 2))

-    return FALSE;

-

-  /* Create .glink for lazy dynamic linking support.  */

-  htab->glink = bfd_make_section_anyway_with_flags (dynobj, ".glink",

-						    flags);

-  if (htab->glink == NULL

-      || ! bfd_set_section_alignment (dynobj, htab->glink, 3))

-    return FALSE;

-

-  if (!info->no_ld_generated_unwind_info)

-    {

-      flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_HAS_CONTENTS

-	       | SEC_IN_MEMORY | SEC_LINKER_CREATED);

-      htab->glink_eh_frame = bfd_make_section_anyway_with_flags (dynobj,

-								 ".eh_frame",

-								 flags);

-      if (htab->glink_eh_frame == NULL

-	  || !bfd_set_section_alignment (dynobj, htab->glink_eh_frame, 2))

-	return FALSE;

-    }

-

-  flags = SEC_ALLOC | SEC_LINKER_CREATED;

-  htab->iplt = bfd_make_section_anyway_with_flags (dynobj, ".iplt", flags);

-  if (htab->iplt == NULL

-      || ! bfd_set_section_alignment (dynobj, htab->iplt, 3))

-    return FALSE;

-

-  flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY

-	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);

-  htab->reliplt = bfd_make_section_anyway_with_flags (dynobj,

-						      ".rela.iplt",

-						      flags);

-  if (htab->reliplt == NULL

-      || ! bfd_set_section_alignment (dynobj, htab->reliplt, 3))

-    return FALSE;

-

-  /* Create branch lookup table for plt_branch stubs.  */

-  flags = (SEC_ALLOC | SEC_LOAD

-	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);

-  htab->brlt = bfd_make_section_anyway_with_flags (dynobj, ".branch_lt",

-						   flags);

-  if (htab->brlt == NULL

-      || ! bfd_set_section_alignment (dynobj, htab->brlt, 3))

-    return FALSE;

-

-  if (!info->shared)

-    return TRUE;

-

-  flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY

-	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);

-  htab->relbrlt = bfd_make_section_anyway_with_flags (dynobj,

-						      ".rela.branch_lt",

-						      flags);

-  if (htab->relbrlt == NULL

-      || ! bfd_set_section_alignment (dynobj, htab->relbrlt, 3))

-    return FALSE;

-

-  return TRUE;

-}

-

 /* Create .got and .rela.got sections in ABFD, and .got in dynobj if

    not already done.  */

@@ -4464,15 +4475,9 @@ create_got_section (bfd *abfd, struct bfd_link_info *info)

   if (htab == NULL)

     return FALSE;

-  if (!htab->got)

-    {

-      if (! _bfd_elf_create_got_section (htab->elf.dynobj, info))

-	return FALSE;

-

-      htab->got = bfd_get_linker_section (htab->elf.dynobj, ".got");

-      if (!htab->got)

-	abort ();

-    }

+  if (!htab->elf.sgot

+      && !_bfd_elf_create_got_section (htab->elf.dynobj, info))

+    return FALSE;

   flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY

 	   | SEC_LINKER_CREATED);

@@ -4507,15 +4512,11 @@ ppc64_elf_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)

   if (htab == NULL)

     return FALSE;

-  if (!htab->got)

-    htab->got = bfd_get_linker_section (dynobj, ".got");

-  htab->plt = bfd_get_linker_section (dynobj, ".plt");

-  htab->relplt = bfd_get_linker_section (dynobj, ".rela.plt");

   htab->dynbss = bfd_get_linker_section (dynobj, ".dynbss");

   if (!info->shared)

     htab->relbss = bfd_get_linker_section (dynobj, ".rela.bss");

-  if (!htab->got || !htab->plt || !htab->relplt || !htab->dynbss

+  if (!htab->elf.sgot || !htab->elf.splt || !htab->elf.srelplt || !htab->dynbss

       || (!info->shared && !htab->relbss))

     abort ();

@@ -4941,7 +4942,12 @@ ppc64_elf_process_dot_syms (bfd *ibfd, struct bfd_link_info *info)

       while ((eh = *p) != NULL)

 	{

 	  *p = NULL;

-	  if (!add_symbol_adjust (eh, info))

+	  if (&eh->elf == htab->elf.hgot)

+	    ;

+	  else if (htab->elf.hgot == NULL

+		   && strcmp (eh->elf.root.root.string, ".TOC.") == 0)

+	    htab->elf.hgot = &eh->elf;

+	  else if (!add_symbol_adjust (eh, info))

 	    return FALSE;

 	  p = &eh->u.next_dot_sym;

 	}

@@ -4968,17 +4974,22 @@ ppc64_elf_process_dot_syms (bfd *ibfd, struct bfd_link_info *info)

 /* Undo hash table changes when an --as-needed input file is determined

    not to be needed.  */

+__attribute__((unused))

 static bfd_boolean

-ppc64_elf_as_needed_cleanup (bfd *ibfd ATTRIBUTE_UNUSED,

-			     struct bfd_link_info *info)

+ppc64_elf_notice_as_needed (bfd *ibfd,

+			    struct bfd_link_info *info,

+			    enum notice_asneeded_action act)

 {

-  struct ppc_link_hash_table *htab = ppc_hash_table (info);

+  if (act == notice_not_needed)

+    {

+      struct ppc_link_hash_table *htab = ppc_hash_table (info);

-  if (htab == NULL)

-    return FALSE;

+      if (htab == NULL)

+	return FALSE;

-  htab->dot_syms = NULL;

-  return TRUE;

+      htab->dot_syms = NULL;

+    }

+  return _bfd_elf_notice_as_needed (ibfd, info, act);

 }

 /* If --just-symbols against a final linked binary, then assume we need

@@ -4991,10 +5002,8 @@ ppc64_elf_link_just_syms (asection *sec, struct bfd_link_info *info)

       && (sec->owner->flags & (EXEC_P | DYNAMIC)) != 0

       && is_ppc64_elf (sec->owner))

     {

-      asection *got = bfd_get_section_by_name (sec->owner, ".got");

-      if (got != NULL

-	  && got->size >= elf_backend_got_header_size

-	  && bfd_get_section_by_name (sec->owner, ".opd") != NULL)

+      if (abiversion (sec->owner) >= 2

+	  || bfd_get_section_by_name (sec->owner, ".opd") != NULL)

 	sec->has_toc_reloc = 1;

     }

   _bfd_elf_link_just_syms (sec, info);

@@ -5162,10 +5171,6 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,

       ppc64_elf_section_data (sec)->sec_type = sec_opd;

     }

-  if (htab->sfpr == NULL

-      && !create_linkage_sections (htab->elf.dynobj, info))

-    return FALSE;

-

   rel_end = relocs + sec->reloc_count;

   for (rel = relocs; rel < rel_end; rel++)

     {

@@ -5183,6 +5188,13 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,

 	{

 	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];

 	  h = elf_follow_link (h);

+

+	  /* PR15323, ref flags aren't set for references in the same

+	     object.  */

+	  h->root.non_ir_ref = 1;

+

+	  if (h == htab->elf.hgot)

+	    sec->has_toc_reloc = 1;

 	}

       tls_type = 0;

@@ -5656,7 +5668,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,

 	  if ((info->shared

 	       && (must_be_dyn_reloc (info, r_type)

 		   || (h != NULL

-		       && (! info->symbolic

+		       && (!SYMBOLIC_BIND (info, h)

 			   || h->root.type == bfd_link_hash_defweak

 			   || !h->def_regular))))

 	      || (ELIMINATE_COPY_RELOCS

@@ -5667,9 +5679,6 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,

 	      || (!info->shared

 		  && ifunc != NULL))

 	    {

-	      struct elf_dyn_relocs *p;

-	      struct elf_dyn_relocs **head;

-

 	      /* We must copy these reloc types into the output file.

 		 Create a reloc section in dynobj and make room for

 		 this reloc.  */

@@ -5686,13 +5695,34 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,

 		 relocations we need for this symbol.  */

 	      if (h != NULL)

 		{

+		  struct elf_dyn_relocs *p;

+		  struct elf_dyn_relocs **head;

+

 		  head = &((struct ppc_link_hash_entry *) h)->dyn_relocs;

+		  p = *head;

+		  if (p == NULL || p->sec != sec)

+		    {

+		      p = bfd_alloc (htab->elf.dynobj, sizeof *p);

+		      if (p == NULL)

+			return FALSE;

+		      p->next = *head;

+		      *head = p;

+		      p->sec = sec;

+		      p->count = 0;

+		      p->pc_count = 0;

+		    }

+		  p->count += 1;

+		  if (!must_be_dyn_reloc (info, r_type))

+		    p->pc_count += 1;

 		}

 	      else

 		{

 		  /* Track dynamic relocs needed for local syms too.

 		     We really need local syms available to do this

 		     easily.  Oh well.  */

+		  struct ppc_dyn_relocs *p;

+		  struct ppc_dyn_relocs **head;

+		  bfd_boolean is_ifunc;

 		  asection *s;

 		  void *vpp;

 		  Elf_Internal_Sym *isym;

@@ -5707,25 +5737,24 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,

 		    s = sec;

 		  vpp = &elf_section_data (s)->local_dynrel;

-		  head = (struct elf_dyn_relocs **) vpp;

-		}

-

-	      p = *head;

-	      if (p == NULL || p->sec != sec)

-		{

-		  p = bfd_alloc (htab->elf.dynobj, sizeof *p);

-		  if (p == NULL)

-		    return FALSE;

-		  p->next = *head;

-		  *head = p;

-		  p->sec = sec;

-		  p->count = 0;

-		  p->pc_count = 0;

+		  head = (struct ppc_dyn_relocs **) vpp;

+		  is_ifunc = ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC;

+		  p = *head;

+		  if (p != NULL && p->sec == sec && p->ifunc != is_ifunc)

+		    p = p->next;

+		  if (p == NULL || p->sec != sec || p->ifunc != is_ifunc)

+		    {

+		      p = bfd_alloc (htab->elf.dynobj, sizeof *p);

+		      if (p == NULL)

+			return FALSE;

+		      p->next = *head;

+		      *head = p;

+		      p->sec = sec;

+		      p->ifunc = is_ifunc;

+		      p->count = 0;

+		    }

+		  p->count += 1;

 		}

-

-	      p->count += 1;

-	      if (!must_be_dyn_reloc (info, r_type))

-		p->pc_count += 1;

 	    }

 	  break;

@@ -5828,12 +5857,16 @@ opd_entry_value (asection *opd_sec,

      at a final linked executable with addr2line or somesuch.  */

   if (opd_sec->reloc_count == 0)

     {

-      char buf[8];

+      bfd_byte *contents = ppc64_elf_tdata (opd_bfd)->opd.contents;

-      if (!bfd_get_section_contents (opd_bfd, opd_sec, buf, offset, 8))

-	return (bfd_vma) -1;

+      if (contents == NULL)

+	{

+	  if (!bfd_malloc_and_get_section (opd_bfd, opd_sec, &contents))

+	    return (bfd_vma) -1;

+	  ppc64_elf_tdata (opd_bfd)->opd.contents = contents;

+	}

-      val = bfd_get_64 (opd_bfd, buf);

+      val = bfd_get_64 (opd_bfd, contents + offset);

       if (code_sec != NULL)

 	{

 	  asection *sec, *likely = NULL;

@@ -5865,7 +5898,7 @@ opd_entry_value (asection *opd_sec,

   BFD_ASSERT (is_ppc64_elf (opd_bfd));

-  relocs = ppc64_elf_tdata (opd_bfd)->opd_relocs;

+  relocs = ppc64_elf_tdata (opd_bfd)->opd.relocs;

   if (relocs == NULL)

     relocs = _bfd_elf_link_read_relocs (opd_bfd, opd_sec, NULL, NULL, TRUE);

@@ -5921,11 +5954,30 @@ opd_entry_value (asection *opd_sec,

 		  sym_hashes = elf_sym_hashes (opd_bfd);

 		  rh = sym_hashes[symndx - symtab_hdr->sh_info];

-		  rh = elf_follow_link (rh);

-		  BFD_ASSERT (rh->root.type == bfd_link_hash_defined

-			      || rh->root.type == bfd_link_hash_defweak);

-		  val = rh->root.u.def.value;

-		  sec = rh->root.u.def.section;

+		  if (rh != NULL)

+		    {

+		      rh = elf_follow_link (rh);

+		      BFD_ASSERT (rh->root.type == bfd_link_hash_defined

+				  || rh->root.type == bfd_link_hash_defweak);

+		      val = rh->root.u.def.value;

+		      sec = rh->root.u.def.section;

+		    }

+		  else

+		    {

+		      /* Handle the odd case where we can be called

+			 during bfd_elf_link_add_symbols before the

+			 symbol hashes have been fully populated.  */

+		      Elf_Internal_Sym *sym;

+

+		      sym = bfd_elf_get_elf_syms (opd_bfd, symtab_hdr, 1,

+						  symndx, NULL, NULL, NULL);

+		      if (sym == NULL)

+			break;

+

+		      val = sym->st_value;

+		      sec = bfd_section_from_elf_index (opd_bfd, sym->st_shndx);

+		      free (sym);

+		    }

 		}

 	      val += look->r_addend;

 	      if (code_off != NULL)

@@ -6782,6 +6834,21 @@ ppc64_elf_func_desc_adjust (bfd *obfd ATTRIBUTE_UNUSED,

   if (htab == NULL)

     return FALSE;

+  if (!info->relocatable

+      && htab->elf.hgot != NULL)

+    {

+      _bfd_elf_link_hash_hide_symbol (info, htab->elf.hgot, TRUE);

+      /* Make .TOC. defined so as to prevent it being made dynamic.

+	 The wrong value here is fixed later in ppc64_elf_set_toc.  */

+      htab->elf.hgot->type = STT_OBJECT;

+      htab->elf.hgot->root.type = bfd_link_hash_defined;

+      htab->elf.hgot->root.u.def.value = 0;

+      htab->elf.hgot->root.u.def.section = bfd_abs_section_ptr;

+      htab->elf.hgot->def_regular = 1;

+      htab->elf.hgot->other = ((htab->elf.hgot->other & ~ELF_ST_VISIBILITY (-1))

+			       | STV_HIDDEN);

+    }

+

   if (htab->sfpr == NULL)

     /* We don't have any relocs.  */

     return TRUE;

@@ -7267,7 +7334,7 @@ adjust_opd_syms (struct elf_link_hash_entry *h, void *inf ATTRIBUTE_UNUSED)

 }

 /* Handles decrementing dynamic reloc counts for the reloc specified by

-   R_INFO in section SEC.  If LOCAL_SYMS is NULL, then H and SYM_SEC

+   R_INFO in section SEC.  If LOCAL_SYMS is NULL, then H and SYM

    have already been determined.  */

 static bfd_boolean

@@ -7276,11 +7343,10 @@ dec_dynrel_count (bfd_vma r_info,

 		  struct bfd_link_info *info,

 		  Elf_Internal_Sym **local_syms,

 		  struct elf_link_hash_entry *h,

-		  asection *sym_sec)

+		  Elf_Internal_Sym *sym)

 {

   enum elf_ppc64_reloc_type r_type;

-  struct elf_dyn_relocs *p;

-  struct elf_dyn_relocs **pp;

+  asection *sym_sec = NULL;