From 1861591a75b8a73af1d3df578fb93bbb73c2f42d Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 10 Feb 2016 19:33:52 -0800 Subject: [PATCH] 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. Backport from master PR ld/19601 * elf32-i386.c (elf_i386_relocate_section): Mask off the least significant bit in GOT offset for R_386_GOT32X. --- bfd/ChangeLog | 9 +++++++++ bfd/elf32-i386.c | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1704438c229..9bd29253c1a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +2016-02-10 H.J. Lu + + Backport from master + 2016-02-10 H.J. Lu + + 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-02 H.J. Lu Backport from master diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 300839b2794..0c79d1673c8 100644 --- 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; -- 2.47.3