1 files changed, 270 insertions, 468 deletions

diff --git a/contrib/binutils/bfd/elf32-ppc.c b/contrib/binutils/bfd/elf32-ppc.c
index 0441fe2bf6b9..d7700140667a 100644
--- a/contrib/binutils/bfd/elf32-ppc.c
+++ b/contrib/binutils/bfd/elf32-ppc.c
@@ -746,7 +746,7 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0xffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
-  /* Marker relocs for TLS.  */
+  /* Marker reloc for TLS.  */
   HOWTO (R_PPC_TLS,
 	 0,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
@@ -761,34 +761,6 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
 	 0,			/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
-  HOWTO (R_PPC_TLSGD,
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* special_function */
-	 "R_PPC_TLSGD",		/* name */
-	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  HOWTO (R_PPC_TLSLD,
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* special_function */
-	 "R_PPC_TLSLD",		/* name */
-	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
   /* Computes the load module index of the load module that contains the
      definition of its TLS sym.  */
   HOWTO (R_PPC_DTPMOD32,
@@ -1552,8 +1524,6 @@ ppc_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
     case BFD_RELOC_CTOR:		r = R_PPC_ADDR32;		break;
     case BFD_RELOC_PPC_TOC16:		r = R_PPC_TOC16;		break;
     case BFD_RELOC_PPC_TLS:		r = R_PPC_TLS;			break;
-    case BFD_RELOC_PPC_TLSGD:		r = R_PPC_TLSGD;		break;
-    case BFD_RELOC_PPC_TLSLD:		r = R_PPC_TLSLD;		break;
     case BFD_RELOC_PPC_DTPMOD:		r = R_PPC_DTPMOD32;		break;
     case BFD_RELOC_PPC_TPREL16:		r = R_PPC_TPREL16;		break;
     case BFD_RELOC_PPC_TPREL16_LO:	r = R_PPC_TPREL16_LO;		break;
@@ -2375,34 +2345,16 @@ struct plt_entry
   bfd_vma glink_offset;
 };
 
-/* Of those relocs that might be copied as dynamic relocs, this function
+/* Of those relocs that might be copied as dynamic relocs, this macro
    selects those that must be copied when linking a shared library,
    even when the symbol is local.  */
 
-static int
-must_be_dyn_reloc (struct bfd_link_info *info,
-		   enum elf_ppc_reloc_type r_type)
-{
-  switch (r_type)
-    {
-    default:
-      return 1;
-
-    case R_PPC_REL24:
-    case R_PPC_REL14:
-    case R_PPC_REL14_BRTAKEN:
-    case R_PPC_REL14_BRNTAKEN:
-    case R_PPC_REL32:
-      return 0;
-
-    case R_PPC_TPREL32:
-    case R_PPC_TPREL16:
-    case R_PPC_TPREL16_LO:
-    case R_PPC_TPREL16_HI:
-    case R_PPC_TPREL16_HA:
-      return !info->executable;
-    }
-}
+#define MUST_BE_DYN_RELOC(RTYPE)		\
+  ((RTYPE) != R_PPC_REL24			\
+   && (RTYPE) != R_PPC_REL14			\
+   && (RTYPE) != R_PPC_REL14_BRTAKEN		\
+   && (RTYPE) != R_PPC_REL14_BRNTAKEN		\
+   && (RTYPE) != R_PPC_REL32)
 
 /* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
    copying dynamic variables from a shared lib into an app's dynbss
@@ -2469,7 +2421,7 @@ struct ppc_elf_link_hash_table
   /* The .got.plt section (VxWorks only)*/
   asection *sgotplt;
 
-  /* Shortcut to __tls_get_addr.  */
+  /* Shortcut to .__tls_get_addr.  */
   struct elf_link_hash_entry *tls_get_addr;
 
   /* The bfd that forced an old-style PLT.  */
@@ -3088,7 +3040,6 @@ ppc_elf_check_relocs (bfd *abfd,
   const Elf_Internal_Rela *rel;
   const Elf_Internal_Rela *rel_end;
   asection *got2, *sreloc;
-  struct elf_link_hash_entry *tga;
 
   if (info->relocatable)
     return TRUE;
@@ -3112,8 +3063,6 @@ ppc_elf_check_relocs (bfd *abfd,
     ppc_elf_howto_init ();
 
   htab = ppc_elf_hash_table (info);
-  tga = elf_link_hash_lookup (&htab->elf, "__tls_get_addr",
-			      FALSE, FALSE, TRUE);
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
   got2 = bfd_get_section_by_name (abfd, ".got2");
@@ -3125,7 +3074,7 @@ ppc_elf_check_relocs (bfd *abfd,
       unsigned long r_symndx;
       enum elf_ppc_reloc_type r_type;
       struct elf_link_hash_entry *h;
-      int tls_type;
+      int tls_type = 0;
 
       r_symndx = ELF32_R_SYM (rel->r_info);
       if (r_symndx < symtab_hdr->sh_info)
@@ -3152,48 +3101,14 @@ ppc_elf_check_relocs (bfd *abfd,
 	  BFD_ASSERT (h == htab->elf.hgot);
 	}
 
-      tls_type = 0;
       r_type = ELF32_R_TYPE (rel->r_info);
-      if (h != NULL && h == tga)
-	switch (r_type)
-	  {
-	  default:
-	    break;
-
-	  case R_PPC_PLTREL24:
-	  case R_PPC_LOCAL24PC:
-	  case R_PPC_REL24:
-	  case R_PPC_REL14:
-	  case R_PPC_REL14_BRTAKEN:
-	  case R_PPC_REL14_BRNTAKEN:
-	  case R_PPC_ADDR24:
-	  case R_PPC_ADDR14:
-	  case R_PPC_ADDR14_BRTAKEN:
-	  case R_PPC_ADDR14_BRNTAKEN:
-	    if (rel != relocs
-		&& (ELF32_R_TYPE (rel[-1].r_info) == R_PPC_TLSGD
-		    || ELF32_R_TYPE (rel[-1].r_info) == R_PPC_TLSLD))
-	      /* We have a new-style __tls_get_addr call with a marker
-		 reloc.  */
-	      ;
-	    else
-	      /* Mark this section as having an old-style call.  */
-	      sec->has_tls_get_addr_call = 1;
-	    break;
-	  }
-
       switch (r_type)
 	{
-	case R_PPC_TLSGD:
-	case R_PPC_TLSLD:
-	  /* These special tls relocs tie a call to __tls_get_addr with
-	     its parameter symbol.  */
-	  break;
-
 	case R_PPC_GOT_TLSLD16:
 	case R_PPC_GOT_TLSLD16_LO:
 	case R_PPC_GOT_TLSLD16_HI:
 	case R_PPC_GOT_TLSLD16_HA:
+	  htab->tlsld_got.refcount += 1;
 	  tls_type = TLS_TLS | TLS_LD;
 	  goto dogottls;
 
@@ -3208,7 +3123,7 @@ ppc_elf_check_relocs (bfd *abfd,
 	case R_PPC_GOT_TPREL16_LO:
 	case R_PPC_GOT_TPREL16_HI:
 	case R_PPC_GOT_TPREL16_HA:
-	  if (!info->executable)
+	  if (info->shared)
 	    info->flags |= DF_STATIC_TLS;
 	  tls_type = TLS_TLS | TLS_TPREL;
 	  goto dogottls;
@@ -3443,7 +3358,7 @@ ppc_elf_check_relocs (bfd *abfd,
 
 	  /* This refers only to functions defined in the shared library.  */
 	case R_PPC_LOCAL24PC:
-	  if (h != NULL && h == htab->elf.hgot && htab->plt_type == PLT_UNSET)
+	  if (h && h == htab->elf.hgot && htab->plt_type == PLT_UNSET)
 	    {
 	      htab->plt_type = PLT_OLD;
 	      htab->old_bfd = abfd;
@@ -3466,11 +3381,7 @@ ppc_elf_check_relocs (bfd *abfd,
 
 	  /* We shouldn't really be seeing these.  */
 	case R_PPC_TPREL32:
-	case R_PPC_TPREL16:
-	case R_PPC_TPREL16_LO:
-	case R_PPC_TPREL16_HI:
-	case R_PPC_TPREL16_HA:
-	  if (!info->executable)
+	  if (info->shared)
 	    info->flags |= DF_STATIC_TLS;
 	  goto dodyn;
 
@@ -3479,6 +3390,14 @@ ppc_elf_check_relocs (bfd *abfd,
 	case R_PPC_DTPREL32:
 	  goto dodyn;
 
+	case R_PPC_TPREL16:
+	case R_PPC_TPREL16_LO:
+	case R_PPC_TPREL16_HI:
+	case R_PPC_TPREL16_HA:
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+	  goto dodyn;
+
 	case R_PPC_REL32:
 	  if (h == NULL
 	      && got2 != NULL
@@ -3569,7 +3488,7 @@ ppc_elf_check_relocs (bfd *abfd,
 	     dynamic library if we manage to avoid copy relocs for the
 	     symbol.  */
 	  if ((info->shared
-	       && (must_be_dyn_reloc (info, r_type)
+	       && (MUST_BE_DYN_RELOC (r_type)
 		   || (h != NULL
 		       && (! info->symbolic
 			   || h->root.type == bfd_link_hash_defweak
@@ -3664,7 +3583,7 @@ ppc_elf_check_relocs (bfd *abfd,
 		}
 
 	      p->count += 1;
-	      if (!must_be_dyn_reloc (info, r_type))
+	      if (!MUST_BE_DYN_RELOC (r_type))
 		p->pc_count += 1;
 	    }
 
@@ -3984,6 +3903,9 @@ ppc_elf_gc_sweep_hook (bfd *abfd,
 	case R_PPC_GOT_TLSLD16_LO:
 	case R_PPC_GOT_TLSLD16_HI:
 	case R_PPC_GOT_TLSLD16_HA:
+	  htab->tlsld_got.refcount -= 1;
+	  /* Fall thru */
+
 	case R_PPC_GOT_TLSGD16:
 	case R_PPC_GOT_TLSGD16_LO:
 	case R_PPC_GOT_TLSGD16_HI:
@@ -4057,8 +3979,7 @@ ppc_elf_gc_sweep_hook (bfd *abfd,
   return TRUE;
 }
 
-/* Set plt output section type, htab->tls_get_addr, and call the
-   generic ELF tls_setup function.  */
+/* Set htab->tls_get_addr and call the generic ELF tls_setup function.  */
 
 asection *
 ppc_elf_tls_setup (bfd *obfd, struct bfd_link_info *info)
@@ -4079,43 +4000,6 @@ ppc_elf_tls_setup (bfd *obfd, struct bfd_link_info *info)
   return _bfd_elf_tls_setup (obfd, info);
 }
 
-/* Return TRUE iff REL is a branch reloc with a global symbol matching
-   HASH.  */
-
-static bfd_boolean
-branch_reloc_hash_match (const bfd *ibfd,
-			 const Elf_Internal_Rela *rel,
-			 const struct elf_link_hash_entry *hash)
-{
-  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
-  enum elf_ppc_reloc_type r_type = ELF32_R_TYPE (rel->r_info);
-  unsigned int r_symndx = ELF32_R_SYM (rel->r_info);
-
-  if (r_symndx >= symtab_hdr->sh_info
-      && (r_type == R_PPC_PLTREL24
-	  || r_type == R_PPC_LOCAL24PC
-	  || r_type == R_PPC_REL14
-	  || r_type == R_PPC_REL14_BRTAKEN
-	  || r_type == R_PPC_REL14_BRNTAKEN
-	  || r_type == R_PPC_REL24
-	  || r_type == R_PPC_ADDR24
-	  || r_type == R_PPC_ADDR14
-	  || r_type == R_PPC_ADDR14_BRTAKEN
-	  || r_type == R_PPC_ADDR14_BRNTAKEN))
-    {
-      struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (ibfd);
-      struct elf_link_hash_entry *h;
-
-      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-      while (h->root.type == bfd_link_hash_indirect
-	     || h->root.type == bfd_link_hash_warning)
-	h = (struct elf_link_hash_entry *) h->root.u.i.link;
-      if (h == hash)
-	return TRUE;
-    }
-  return FALSE;
-}
-
 /* Run through all the TLS relocs looking for optimization
    opportunities.  */
 
@@ -4126,204 +4010,187 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED,
   bfd *ibfd;
   asection *sec;
   struct ppc_elf_link_hash_table *htab;
-  int pass;
 
-  if (info->relocatable || !info->executable)
+  if (info->relocatable || info->shared)
     return TRUE;
 
   htab = ppc_elf_hash_table (info);
-  /* Make two passes through the relocs.  First time check that tls
-     relocs involved in setting up a tls_get_addr call are indeed
-     followed by such a call.  If they are not, exclude them from
-     the optimizations done on the second pass.  */
-  for (pass = 0; pass < 2; ++pass)
-    for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
-      {
-	Elf_Internal_Sym *locsyms = NULL;
-	Elf_Internal_Shdr *symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
-
-	for (sec = ibfd->sections; sec != NULL; sec = sec->next)
-	  if (sec->has_tls_reloc && !bfd_is_abs_section (sec->output_section))
-	    {
-	      Elf_Internal_Rela *relstart, *rel, *relend;
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      Elf_Internal_Sym *locsyms = NULL;
+      Elf_Internal_Shdr *symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
 
-	      /* Read the relocations.  */
-	      relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL,
-						    info->keep_memory);
-	      if (relstart == NULL)
-		return FALSE;
+      for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	if (sec->has_tls_reloc && !bfd_is_abs_section (sec->output_section))
+	  {
+	    Elf_Internal_Rela *relstart, *rel, *relend;
+	    int expecting_tls_get_addr;
 
-	      relend = relstart + sec->reloc_count;
-	      for (rel = relstart; rel < relend; rel++)
-		{
-		  enum elf_ppc_reloc_type r_type;
-		  unsigned long r_symndx;
-		  struct elf_link_hash_entry *h = NULL;
-		  char *tls_mask;
-		  char tls_set, tls_clear;
-		  bfd_boolean is_local;
-		  int expecting_tls_get_addr;
-		  bfd_signed_vma *got_count;
-
-		  r_symndx = ELF32_R_SYM (rel->r_info);
-		  if (r_symndx >= symtab_hdr->sh_info)
-		    {
-		      struct elf_link_hash_entry **sym_hashes;
+	    /* Read the relocations.  */
+	    relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL,
+						  info->keep_memory);
+	    if (relstart == NULL)
+	      return FALSE;
 
-		      sym_hashes = elf_sym_hashes (ibfd);
-		      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-		      while (h->root.type == bfd_link_hash_indirect
-			     || h->root.type == bfd_link_hash_warning)
-			h = (struct elf_link_hash_entry *) h->root.u.i.link;
-		    }
+	    expecting_tls_get_addr = 0;
+	    relend = relstart + sec->reloc_count;
+	    for (rel = relstart; rel < relend; rel++)
+	      {
+		enum elf_ppc_reloc_type r_type;
+		unsigned long r_symndx;
+		struct elf_link_hash_entry *h = NULL;
+		char *tls_mask;
+		char tls_set, tls_clear;
+		bfd_boolean is_local;
+
+		r_symndx = ELF32_R_SYM (rel->r_info);
+		if (r_symndx >= symtab_hdr->sh_info)
+		  {
+		    struct elf_link_hash_entry **sym_hashes;
 
-		  expecting_tls_get_addr = 0;
-		  is_local = FALSE;
-		  if (h == NULL
-		      || !h->def_dynamic)
-		    is_local = TRUE;
+		    sym_hashes = elf_sym_hashes (ibfd);
+		    h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+		    while (h->root.type == bfd_link_hash_indirect
+			   || h->root.type == bfd_link_hash_warning)
+		      h = (struct elf_link_hash_entry *) h->root.u.i.link;
+		  }
 
-		  r_type = ELF32_R_TYPE (rel->r_info);
-		  switch (r_type)
-		    {
-		    case R_PPC_GOT_TLSLD16:
-		    case R_PPC_GOT_TLSLD16_LO:
-		      expecting_tls_get_addr = 1;
-		      /* Fall thru */
-
-		    case R_PPC_GOT_TLSLD16_HI:
-		    case R_PPC_GOT_TLSLD16_HA:
-		      /* These relocs should never be against a symbol
-			 defined in a shared lib.  Leave them alone if
-			 that turns out to be the case.  */
-		      if (!is_local)
-			continue;
-
-		      /* LD -> LE */
-		      tls_set = 0;
-		      tls_clear = TLS_LD;
-		      break;
-
-		    case R_PPC_GOT_TLSGD16:
-		    case R_PPC_GOT_TLSGD16_LO:
-		      expecting_tls_get_addr = 1;
-		      /* Fall thru */
-
-		    case R_PPC_GOT_TLSGD16_HI:
-		    case R_PPC_GOT_TLSGD16_HA:
-		      if (is_local)
-			/* GD -> LE */
-			tls_set = 0;
-		      else
-			/* GD -> IE */
-			tls_set = TLS_TLS | TLS_TPRELGD;
-		      tls_clear = TLS_GD;
-		      break;
-
-		    case R_PPC_GOT_TPREL16:
-		    case R_PPC_GOT_TPREL16_LO:
-		    case R_PPC_GOT_TPREL16_HI:
-		    case R_PPC_GOT_TPREL16_HA:
-		      if (is_local)
-			{
-			  /* IE -> LE */
-			  tls_set = 0;
-			  tls_clear = TLS_TPREL;
-			  break;
-			}
-		      else
-			continue;
+		is_local = FALSE;
+		if (h == NULL
+		    || !h->def_dynamic)
+		  is_local = TRUE;
 
-		    default:
+		r_type = ELF32_R_TYPE (rel->r_info);
+		switch (r_type)
+		  {
+		  case R_PPC_GOT_TLSLD16:
+		  case R_PPC_GOT_TLSLD16_LO:
+		  case R_PPC_GOT_TLSLD16_HI:
+		  case R_PPC_GOT_TLSLD16_HA:
+		    /* These relocs should never be against a symbol
+		       defined in a shared lib.  Leave them alone if
+		       that turns out to be the case.  */
+		    expecting_tls_get_addr = 0;
+		    htab->tlsld_got.refcount -= 1;
+		    if (!is_local)
 		      continue;
-		    }
 
-		  if (pass == 0)
-		    {
-		      if (!expecting_tls_get_addr
-			  || !sec->has_tls_get_addr_call)
-			continue;
-
-		      if (rel + 1 < relend
-			  && branch_reloc_hash_match (ibfd, rel + 1,
-						      htab->tls_get_addr))
-			continue;
-
-		      /* Uh oh, we didn't find the expected call.  We
-			 could just mark this symbol to exclude it
-			 from tls optimization but it's safer to skip
-			 the entire section.  */
-		      sec->has_tls_reloc = 0;
-		      break;
-		    }
+		    /* LD -> LE */
+		    tls_set = 0;
+		    tls_clear = TLS_LD;
+		    expecting_tls_get_addr = 1;
+		    break;
 
-		  if (h != NULL)
-		    {
-		      tls_mask = &ppc_elf_hash_entry (h)->tls_mask;
-		      got_count = &h->got.refcount;
-		    }
-		  else
-		    {
-		      Elf_Internal_Sym *sym;
-		      bfd_signed_vma *lgot_refs;
-		      char *lgot_masks;
+		  case R_PPC_GOT_TLSGD16:
+		  case R_PPC_GOT_TLSGD16_LO:
+		  case R_PPC_GOT_TLSGD16_HI:
+		  case R_PPC_GOT_TLSGD16_HA:
+		    if (is_local)
+		      /* GD -> LE */
+		      tls_set = 0;
+		    else
+		      /* GD -> IE */
+		      tls_set = TLS_TLS | TLS_TPRELGD;
+		    tls_clear = TLS_GD;
+		    expecting_tls_get_addr = 1;
+		    break;
 
-		      if (locsyms == NULL)
-			{
-			  locsyms = (Elf_Internal_Sym *) symtab_hdr->contents;
-			  if (locsyms == NULL)
-			    locsyms = bfd_elf_get_elf_syms (ibfd, symtab_hdr,
-							    symtab_hdr->sh_info,
-							    0, NULL, NULL, NULL);
-			  if (locsyms == NULL)
-			    {
-			      if (elf_section_data (sec)->relocs != relstart)
-				free (relstart);
-			      return FALSE;
-			    }
-			}
-		      sym = locsyms + r_symndx;
-		      lgot_refs = elf_local_got_refcounts (ibfd);
-		      if (lgot_refs == NULL)
-			abort ();
-		      lgot_masks = (char *) (lgot_refs + symtab_hdr->sh_info);
-		      tls_mask = &lgot_masks[r_symndx];
-		      got_count = &lgot_refs[r_symndx];
-		    }
+		  case R_PPC_GOT_TPREL16:
+		  case R_PPC_GOT_TPREL16_LO:
+		  case R_PPC_GOT_TPREL16_HI:
+		  case R_PPC_GOT_TPREL16_HA:
+		    expecting_tls_get_addr = 0;
+		    if (is_local)
+		      {
+			/* IE -> LE */
+			tls_set = 0;
+			tls_clear = TLS_TPREL;
+			break;
+		      }
+		    else
+		      continue;
 
-		  if (tls_set == 0)
-		    {
-		      /* We managed to get rid of a got entry.  */
-		      if (*got_count > 0)
-			*got_count -= 1;
-		    }
+		  case R_PPC_REL14:
+		  case R_PPC_REL14_BRTAKEN:
+		  case R_PPC_REL14_BRNTAKEN:
+		  case R_PPC_REL24:
+		    if (expecting_tls_get_addr
+			&& h != NULL
+			&& h == htab->tls_get_addr)
+		      {
+			struct plt_entry *ent = find_plt_ent (h, NULL, 0);
+			if (ent != NULL && ent->plt.refcount > 0)
+			  ent->plt.refcount -= 1;
+		      }
+		    expecting_tls_get_addr = 0;
+		    continue;
 
-		  if (expecting_tls_get_addr)
-		    {
-		      struct plt_entry *ent;
+		  default:
+		    expecting_tls_get_addr = 0;
+		    continue;
+		  }
 
-		      ent = find_plt_ent (htab->tls_get_addr, NULL, 0);
-		      if (ent != NULL && ent->plt.refcount > 0)
-			ent->plt.refcount -= 1;
-		    }
+		if (h != NULL)
+		  {
+		    if (tls_set == 0)
+		      {
+			/* We managed to get rid of a got entry.  */
+			if (h->got.refcount > 0)
+			  h->got.refcount -= 1;
+		      }
+		    tls_mask = &ppc_elf_hash_entry (h)->tls_mask;
+		  }
+		else
+		  {
+		    Elf_Internal_Sym *sym;
+		    bfd_signed_vma *lgot_refs;
+		    char *lgot_masks;
 
-		  *tls_mask |= tls_set;
-		  *tls_mask &= ~tls_clear;
-		}
+		    if (locsyms == NULL)
+		      {
+			locsyms = (Elf_Internal_Sym *) symtab_hdr->contents;
+			if (locsyms == NULL)
+			  locsyms = bfd_elf_get_elf_syms (ibfd, symtab_hdr,
+							  symtab_hdr->sh_info,
+							  0, NULL, NULL, NULL);
+			if (locsyms == NULL)
+			  {
+			    if (elf_section_data (sec)->relocs != relstart)
+			      free (relstart);
+			    return FALSE;
+			  }
+		      }
+		    sym = locsyms + r_symndx;
+		    lgot_refs = elf_local_got_refcounts (ibfd);
+		    if (lgot_refs == NULL)
+		      abort ();
+		    if (tls_set == 0)
+		      {
+			/* We managed to get rid of a got entry.  */
+			if (lgot_refs[r_symndx] > 0)
+			  lgot_refs[r_symndx] -= 1;
+		      }
+		    lgot_masks = (char *) (lgot_refs + symtab_hdr->sh_info);
+		    tls_mask = &lgot_masks[r_symndx];
+		  }
 
-	      if (elf_section_data (sec)->relocs != relstart)
-		free (relstart);
-	    }
+		*tls_mask |= tls_set;
+		*tls_mask &= ~tls_clear;
+	      }
 
-	if (locsyms != NULL
-	    && (symtab_hdr->contents != (unsigned char *) locsyms))
-	  {
-	    if (!info->keep_memory)
-	      free (locsyms);
-	    else
-	      symtab_hdr->contents = (unsigned char *) locsyms;
+	    if (elf_section_data (sec)->relocs != relstart)
+	      free (relstart);
 	  }
-      }
+
+      if (locsyms != NULL
+	  && (symtab_hdr->contents != (unsigned char *) locsyms))
+	{
+	  if (!info->keep_memory)
+	    free (locsyms);
+	  else
+	    symtab_hdr->contents = (unsigned char *) locsyms;
+	}
+    }
   return TRUE;
 }
 
@@ -4748,11 +4615,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
 
       if (eh->tls_mask == (TLS_TLS | TLS_LD)
 	  && !eh->elf.def_dynamic)
-	{
-	  /* If just an LD reloc, we'll just use htab->tlsld_got.offset.  */
-	  htab->tlsld_got.refcount += 1;
-	  eh->elf.got.offset = (bfd_vma) -1;
-	}
+	/* If just an LD reloc, we'll just use htab->tlsld_got.offset.  */
+	eh->elf.got.offset = (bfd_vma) -1;
       else
 	{
 	  bfd_boolean dyn;
@@ -4800,7 +4664,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
   if (info->shared)
     {
       /* Relocs that use pc_count are those that appear on a call insn,
-	 or certain REL relocs (see must_be_dyn_reloc) that can be
+	 or certain REL relocs (see MUST_BE_DYN_RELOC) that can be
 	 generated via assembly.  We want calls to protected symbols to
 	 resolve directly to the function rather than going via the plt.
 	 If people want function pointer comparisons to work as expected
@@ -5027,9 +4891,6 @@ ppc_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
 	  *local_got = (bfd_vma) -1;
     }
 
-  /* Allocate space for global sym dynamic relocs.  */
-  elf_link_hash_traverse (elf_hash_table (info), allocate_dynrelocs, info);
-
   if (htab->tlsld_got.refcount > 0)
     {
       htab->tlsld_got.offset = allocate_got (htab, 8);
@@ -5039,6 +4900,9 @@ ppc_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
   else
     htab->tlsld_got.offset = (bfd_vma) -1;
 
+  /* Allocate space for global sym dynamic relocs.  */
+  elf_link_hash_traverse (elf_hash_table (info), allocate_dynrelocs, info);
+
   if (htab->got != NULL && htab->plt_type != PLT_VXWORKS)
     {
       unsigned int g_o_t = 32768;
@@ -5890,13 +5754,16 @@ ppc_elf_relocate_section (bfd *output_bfd,
 	 for the final instruction stream.  */
       tls_mask = 0;
       tls_gd = 0;
-      if (h != NULL)
-	tls_mask = ((struct ppc_elf_link_hash_entry *) h)->tls_mask;
-      else if (local_got_offsets != NULL)
+      if (IS_PPC_TLS_RELOC (r_type))
 	{
-	  char *lgot_masks;
-	  lgot_masks = (char *) (local_got_offsets + symtab_hdr->sh_info);
-	  tls_mask = lgot_masks[r_symndx];
+	  if (h != NULL)
+	    tls_mask = ((struct ppc_elf_link_hash_entry *) h)->tls_mask;
+	  else if (local_got_offsets != NULL)
+	    {
+	      char *lgot_masks;
+	      lgot_masks = (char *) (local_got_offsets + symtab_hdr->sh_info);
+	      tls_mask = lgot_masks[r_symndx];
+	    }
 	}
 
       /* Ensure reloc mapping code below stays sane.  */
@@ -6003,147 +5870,85 @@ ppc_elf_relocate_section (bfd *output_bfd,
 	case R_PPC_GOT_TLSGD16_LO:
 	  tls_gd = TLS_TPRELGD;
 	  if (tls_mask != 0 && (tls_mask & TLS_GD) == 0)
-	    goto tls_ldgd_opt;
+	    goto tls_get_addr_check;
 	  break;
 
 	case R_PPC_GOT_TLSLD16:
 	case R_PPC_GOT_TLSLD16_LO:
 	  if (tls_mask != 0 && (tls_mask & TLS_LD) == 0)
 	    {
-	      unsigned int insn1, insn2;
-	      bfd_vma offset;
-
-	    tls_ldgd_opt:
-	      offset = (bfd_vma) -1;
-	      /* If not using the newer R_PPC_TLSGD/LD to mark
-		 __tls_get_addr calls, we must trust that the call
-		 stays with its arg setup insns, ie. that the next
-		 reloc is the __tls_get_addr call associated with
-		 the current reloc.  Edit both insns.  */
-	      if (input_section->has_tls_get_addr_call
-		  && rel + 1 < relend
-		  && branch_reloc_hash_match (input_bfd, rel + 1,
-					      htab->tls_get_addr))
-		offset = rel[1].r_offset;
-	      if ((tls_mask & tls_gd) != 0)
+	    tls_get_addr_check:
+	      if (rel + 1 < relend)
 		{
-		  /* IE */
+		  enum elf_ppc_reloc_type r_type2;
+		  unsigned long r_symndx2;
+		  struct elf_link_hash_entry *h2;
+		  bfd_vma insn1, insn2;
+		  bfd_vma offset;
+
+		  /* The next instruction should be a call to
+		     __tls_get_addr.  Peek at the reloc to be sure.  */
+		  r_type2 = ELF32_R_TYPE (rel[1].r_info);
+		  r_symndx2 = ELF32_R_SYM (rel[1].r_info);
+		  if (r_symndx2 < symtab_hdr->sh_info
+		      || (r_type2 != R_PPC_REL14
+			  && r_type2 != R_PPC_REL14_BRTAKEN
+			  && r_type2 != R_PPC_REL14_BRNTAKEN
+			  && r_type2 != R_PPC_REL24
+			  && r_type2 != R_PPC_PLTREL24))
+		    break;
+
+		  h2 = sym_hashes[r_symndx2 - symtab_hdr->sh_info];
+		  while (h2->root.type == bfd_link_hash_indirect
+			 || h2->root.type == bfd_link_hash_warning)
+		    h2 = (struct elf_link_hash_entry *) h2->root.u.i.link;
+		  if (h2 == NULL || h2 != htab->tls_get_addr)
+		    break;
+
+		  /* OK, it checks out.  Replace the call.  */
+		  offset = rel[1].r_offset;
 		  insn1 = bfd_get_32 (output_bfd,
 				      contents + rel->r_offset - d_offset);
-		  insn1 &= (1 << 26) - 1;
-		  insn1 |= 32 << 26;	/* lwz */
-		  if (offset != (bfd_vma) -1)
+		  if ((tls_mask & tls_gd) != 0)
 		    {
-		      rel[1].r_info
-			= ELF32_R_INFO (ELF32_R_SYM (rel[1].r_info),
-					R_PPC_NONE);
+		      /* IE */
+		      insn1 &= (1 << 26) - 1;
+		      insn1 |= 32 << 26;	/* lwz */
 		      insn2 = 0x7c631214;	/* add 3,3,2 */
-		      bfd_put_32 (output_bfd, insn2, contents + offset);
+		      rel[1].r_info = ELF32_R_INFO (r_symndx2, R_PPC_NONE);
+		      rel[1].r_addend = 0;
+		      r_type = (((r_type - (R_PPC_GOT_TLSGD16 & 3)) & 3)
+				+ R_PPC_GOT_TPREL16);
+		      rel->r_info = ELF32_R_INFO (r_symndx, r_type);
 		    }
-		  r_type = (((r_type - (R_PPC_GOT_TLSGD16 & 3)) & 3)
-			    + R_PPC_GOT_TPREL16);
-		  rel->r_info = ELF32_R_INFO (r_symndx, r_type);
-		}
-	      else
-		{
-		  /* LE */
-		  insn1 = 0x3c620000;	/* addis 3,2,0 */
-		  if (tls_gd == 0)
+		  else
 		    {
-		      /* Was an LD reloc.  */
-		      for (r_symndx = 0;
-			   r_symndx < symtab_hdr->sh_info;
-			   r_symndx++)
-			if (local_sections[r_symndx] == sec)
-			  break;
-		      if (r_symndx >= symtab_hdr->sh_info)
-			r_symndx = 0;
-		      rel->r_addend = htab->elf.tls_sec->vma + DTP_OFFSET;
-		      if (r_symndx != 0)
-			rel->r_addend -= (local_syms[r_symndx].st_value
-					  + sec->output_offset
-					  + sec->output_section->vma);
+		      /* LE */
+		      insn1 = 0x3c620000;	/* addis 3,2,0 */
+		      insn2 = 0x38630000;	/* addi 3,3,0 */
+		      if (tls_gd == 0)
+			{
+			  /* Was an LD reloc.  */
+			  r_symndx = 0;
+			  rel->r_addend = htab->elf.tls_sec->vma + DTP_OFFSET;
+			}
+		      r_type = R_PPC_TPREL16_HA;
+		      rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+		      rel[1].r_info = ELF32_R_INFO (r_symndx,
+						    R_PPC_TPREL16_LO);
+		      rel[1].r_offset += d_offset;
+		      rel[1].r_addend = rel->r_addend;
 		    }
-		  r_type = R_PPC_TPREL16_HA;
-		  rel->r_info = ELF32_R_INFO (r_symndx, r_type);
-		  if (offset != (bfd_vma) -1)
+		  bfd_put_32 (output_bfd, insn1, contents + rel->r_offset - d_offset);
+		  bfd_put_32 (output_bfd, insn2, contents + offset);
+		  if (tls_gd == 0)
 		    {
-		      rel[1].r_info = ELF32_R_INFO (r_symndx, R_PPC_TPREL16_LO);
-		      rel[1].r_offset = offset + d_offset;
-		      rel[1].r_addend = rel->r_addend;
-		      insn2 = 0x38630000;	/* addi 3,3,0 */
-		      bfd_put_32 (output_bfd, insn2, contents + offset);
+		      /* We changed the symbol on an LD reloc.  Start over
+			 in order to get h, sym, sec etc. right.  */
+		      rel--;
+		      continue;
 		    }
 		}
-	      bfd_put_32 (output_bfd, insn1,
-			  contents + rel->r_offset - d_offset);
-	      if (tls_gd == 0)
-		{
-		  /* We changed the symbol on an LD reloc.  Start over
-		     in order to get h, sym, sec etc. right.  */
-		  rel--;
-		  continue;
-		}
-	    }
-	  break;
-
-	case R_PPC_TLSGD:
-	  if (tls_mask != 0 && (tls_mask & TLS_GD) == 0)
-	    {
-	      unsigned int insn2;
-	      bfd_vma offset = rel->r_offset;
-
-	      if ((tls_mask & TLS_TPRELGD) != 0)
-		{
-		  /* IE */
-		  r_type = R_PPC_NONE;
-		  insn2 = 0x7c631214;	/* add 3,3,2 */
-		}
-	      else
-		{
-		  /* LE */
-		  r_type = R_PPC_TPREL16_LO;
-		  rel->r_offset += d_offset;
-		  insn2 = 0x38630000;	/* addi 3,3,0 */
-		}
-	      rel->r_info = ELF32_R_INFO (r_symndx, r_type);
-	      bfd_put_32 (output_bfd, insn2, contents + offset);
-	      /* Zap the reloc on the _tls_get_addr call too.  */
-	      BFD_ASSERT (offset == rel[1].r_offset);
-	      rel[1].r_info = ELF32_R_INFO (ELF32_R_SYM (rel[1].r_info),
-					    R_PPC_NONE);
-	    }
-	  break;
-
-	case R_PPC_TLSLD:
-	  if (tls_mask != 0 && (tls_mask & TLS_LD) == 0)
-	    {
-	      unsigned int insn2;
-
-	      for (r_symndx = 0;
-		   r_symndx < symtab_hdr->sh_info;
-		   r_symndx++)
-		if (local_sections[r_symndx] == sec)
-		  break;
-	      if (r_symndx >= symtab_hdr->sh_info)
-		r_symndx = 0;
-	      rel->r_addend = htab->elf.tls_sec->vma + DTP_OFFSET;
-	      if (r_symndx != 0)
-		rel->r_addend -= (local_syms[r_symndx].st_value
-				  + sec->output_offset
-				  + sec->output_section->vma);
-
-	      rel->r_info = ELF32_R_INFO (r_symndx, R_PPC_TPREL16_LO);
-	      rel->r_offset += d_offset;
-	      insn2 = 0x38630000;	/* addi 3,3,0 */
-	      bfd_put_32 (output_bfd, insn2,
-			  contents + rel->r_offset - d_offset);
-	      /* Zap the reloc on the _tls_get_addr call too.  */
-	      BFD_ASSERT (rel->r_offset - d_offset == rel[1].r_offset);
-	      rel[1].r_info = ELF32_R_INFO (ELF32_R_SYM (rel[1].r_info),
-					    R_PPC_NONE);
-	      rel--;
-	      continue;
 	    }
 	  break;
 	}
@@ -6185,7 +5990,7 @@ ppc_elf_relocate_section (bfd *output_bfd,
       howto = NULL;
       if (r_type < R_PPC_max)
 	howto = ppc_elf_howto_table[r_type];
-      switch ((int) r_type)
+      switch (r_type)
 	{
 	default:
 	  (*_bfd_error_handler)
@@ -6198,8 +6003,6 @@ ppc_elf_relocate_section (bfd *output_bfd,
 
 	case R_PPC_NONE:
 	case R_PPC_TLS:
-	case R_PPC_TLSGD:
-	case R_PPC_TLSLD:
 	case R_PPC_EMB_MRKREF:
 	case R_PPC_GNU_VTINHERIT:
 	case R_PPC_GNU_VTENTRY:
@@ -6241,7 +6044,6 @@ ppc_elf_relocate_section (bfd *output_bfd,
 	case R_PPC_GOT16_LO:
 	case R_PPC_GOT16_HI:
 	case R_PPC_GOT16_HA:
-	  tls_mask = 0;
 	dogot:
 	  {
 	    /* Relocation is to the entry for this symbol in the global
@@ -6540,7 +6342,7 @@ ppc_elf_relocate_section (bfd *output_bfd,
 	       && (h == NULL
 		   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
 		   || h->root.type != bfd_link_hash_undefweak)
-	       && (must_be_dyn_reloc (info, r_type)
+	       && (MUST_BE_DYN_RELOC (r_type)
 		   || !SYMBOL_CALLS_LOCAL (info, h)))
 	      || (ELIMINATE_COPY_RELOCS
 		  && !info->shared
@@ -6609,10 +6411,10 @@ ppc_elf_relocate_section (bfd *output_bfd,
 		    outrel.r_info = ELF32_R_INFO (0, R_PPC_RELATIVE);
 		  else
 		    {
-		      long indx = 0;
+		      long indx;
 
-		      if (r_symndx == 0 || bfd_is_abs_section (sec))
-			;
+		      if (bfd_is_abs_section (sec))
+			indx = 0;
 		      else if (sec == NULL || sec->owner == NULL)
 			{
 			  bfd_set_error (bfd_error_bad_value);