This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

tidy elf32-ppc.c


This just removes some useless code.  Applied mainline.

	* elf32-ppc.c (ppc_elf_check_relocs): Remove dead ifunc code.

Index: bfd/elf32-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-ppc.c,v
retrieving revision 1.274
diff -u -p -w -r1.274 elf32-ppc.c
--- bfd/elf32-ppc.c	25 Jan 2010 06:47:16 -0000	1.274
+++ bfd/elf32-ppc.c	8 Feb 2010 00:11:32 -0000
@@ -3445,7 +3445,6 @@ ppc_elf_check_relocs (bfd *abfd,
       enum elf_ppc_reloc_type r_type;
       struct elf_link_hash_entry *h;
       int tls_type;
-      struct plt_entry **ifunc;
 
       r_symndx = ELF32_R_SYM (rel->r_info);
       if (r_symndx < symtab_hdr->sh_info)
@@ -3473,16 +3472,8 @@ ppc_elf_check_relocs (bfd *abfd,
 	}
 
       tls_type = 0;
-      ifunc = NULL;
       r_type = ELF32_R_TYPE (rel->r_info);
-      if (!htab->is_vxworks)
-	{
-	  if (h != NULL)
-	    {
-	      if (h->type == STT_GNU_IFUNC)
-		ifunc = &h->plt.plist;
-	    }
-	  else
+      if (h == NULL && !htab->is_vxworks)
 	    {
 	      Elf_Internal_Sym *isym = bfd_sym_from_r_symndx (&htab->sym_cache,
 							      abfd, r_symndx);
@@ -3493,6 +3484,7 @@ ppc_elf_check_relocs (bfd *abfd,
 		  && (!info->shared
 		      || is_branch_reloc (r_type)))
 		{
+	      struct plt_entry **ifunc;
 		  bfd_vma addend;
 
 		  ifunc = update_local_sym_info (abfd, symtab_hdr, r_symndx,
@@ -3514,7 +3506,6 @@ ppc_elf_check_relocs (bfd *abfd,
 		    return FALSE;
 		}
 	    }
-	}
 
       if (!htab->is_vxworks
 	  && is_branch_reloc (r_type)

-- 
Alan Modra
Australia Development Lab, IBM


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]