From c7d41bf2ae1e092440208ddc0a7c95775e98bd98 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Feb 29 2016 16:19:02 +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;
diff --git a/binutils.spec b/binutils.spec
index d1ca1e5..421cf03 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -20,7 +20,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.26
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -64,6 +64,8 @@ Patch19: binutils-2.26-Bsymbolic_PIE.patch
 Patch20: binutils-2.26-lto.patch
 # Import fix for PR 19698
 Patch21: binutils-rh1312151.patch
+# Import fix for PR 19601
+Patch22: binutils-2.26-fix-GOT-offset-calculation.patch
 
 Provides: bundled(libiberty)
 
@@ -193,6 +195,7 @@ using libelf instead of BFD.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -512,6 +515,10 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Mon Feb 29 2016 Nick Clifton  <nickc@redhat.com> 2.26-14
+- Import patch to fix x86 GOT offset calculation in 2.26 sources (PR 19601)
+  (#1312489)
+
 * Fri Feb 26 2016 Nick Clifton  <nickc@redhat.com> 2.26-13
 - Import patch to fix symbol versioning bug in 2.26 sources (PR 19698)
   (#1312151)