Mask off the least significant bit in GOT offset

The least significant bit in GOT offset is to record whether we have
initialized the GOT entry in R_386_GOT32 processing.  We need to mask
it off for R_386_GOT32X.

	PR ld/19601
	* elf32-i386.c (elf_i386_relocate_section): Mask off the least
	significant bit in GOT offset for R_386_GOT32X.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 40739c88b74c04981d8678a342ab3cc2e355f541..017bbc1838fbc1ed0bec2132ff8403d041aa66c6 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/19601
+       * elf32-i386.c (elf_i386_relocate_section): Mask off the least
+       significant bit in GOT offset for R_386_GOT32X.
+
 2016-02-10  Nick Clifton  <nickc@redhat.com>
 
        PR 19405

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index ccd013533d83ed7c8c6b4382dd41c559195ac789..a8951d8d586bc11d5eef3767c774bda1247e5079 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -4016,10 +4016,12 @@ elf_i386_relocate_section (bfd *output_bfd,
 
          /* It is relative to .got.plt section.  */
          if (h->got.offset != (bfd_vma) -1)
-           /* Use GOT entry.  */
+           /* Use GOT entry.  Mask off the least significant bit in
+              GOT offset which may be set by R_386_GOT32 processing
+              below.  */
            relocation = (htab->elf.sgot->output_section->vma
                          + htab->elf.sgot->output_offset
-                         + h->got.offset - offplt);
+                         + (h->got.offset & ~1) - offplt);
          else
            /* Use GOTPLT entry.  */
            relocation = (h->plt.offset / plt_entry_size - 1 + 3) * 4;