From 0126fe866160d11deb8684a1787dfd9cc610a377 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Feb 29 2016 16:17:52 +0000 Subject: Import patch to fix x86 GOT offset calculation in 2.26 sources (PR 19601) Resolves: #1312489 --- diff --git a/binutils-2.26-fix-GOT-offset-calculation.patch b/binutils-2.26-fix-GOT-offset-calculation.patch new file mode 100644 index 0000000..99e8b70 --- /dev/null +++ b/binutils-2.26-fix-GOT-offset-calculation.patch @@ -0,0 +1,17 @@ +--- binutils-2.26.orig/bfd/elf32-i386.c 2016-02-29 15:47:45.172597805 +0000 ++++ binutils-2.26/bfd/elf32-i386.c 2016-02-29 15:48:42.161904973 +0000 +@@ -4016,10 +4016,12 @@ elf_i386_relocate_section (bfd *output_b + + /* 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;