2011-03-03 Michael Snyder <msnyder@vmware.com>

	* elf64-x86-64.c (elf_x86_64_relocate_section): Remove dead code.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 918927a..94e31dc 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-03  Michael Snyder  <msnyder@vmware.com>
 
+       * elf64-x86-64.c (elf_x86_64_relocate_section): Remove dead code.
+
        * coff-x86_64.c (coff_amd64_rtype_to_howto): Fencepost error.
 
        * aoutx.h (aout_final_link): Use sizeof int not sizeof int*.

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 56eb62e..ad2a1f3 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -3012,18 +3012,6 @@ elf_x86_64_relocate_section (bfd *output_bfd,
              relocation = (base_got->output_section->vma
                            + base_got->output_offset + off);
 
-             if (r_type != R_X86_64_GOTPCREL
-                 && r_type != R_X86_64_GOTPCREL64)
-               {
-                 asection *gotplt;
-                 if (htab->elf.splt != NULL)
-                   gotplt = htab->elf.sgotplt;
-                 else
-                   gotplt = htab->elf.igotplt;
-                 relocation -= (gotplt->output_section->vma
-                                - gotplt->output_offset);
-               }
-
              goto do_relocation;
            }
        }