binutils: Add fixes for binutils issue 16428

"ld:i386 crashes with -static -fPIE -pie"
https://bugs.launchpad.net/ubuntu/+source/binutils/+bug/1266492

This adds in two upstream binutils fixes to avoid the internal error
triggered by the combination of -static with -pie on x86 builds. This
triggers a backtrace which then triggers a bug in glibc where the process
ends up hanging on some systems with broken libcs.

We can't fix the libc but we can stop the internal error and hence
avoid the hanging builds.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 152 insertions, 0 deletions

diff --git a/meta/recipes-devtools/binutils/binutils-2.24.inc b/meta/recipes-devtools/binutils/binutils-2.24.inc
index 42d4ede229..6415a6fbdc 100644
--- a/meta/recipes-devtools/binutils/binutils-2.24.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.24.inc
@@ -28,6 +28,8 @@ SRC_URI = "\
      file://fix-pr15815.patch \
      file://fix-pr2404.patch \
      file://fix-pr16476.patch \
+     file://fix-pr16428a.patch \
+     file://fix-pr16428b.patch \
      "
 
 SRC_URI[md5sum] = "e0f71a7b2ddab0f8612336ac81d9636b"
diff --git a/meta/recipes-devtools/binutils/binutils/fix-pr16428a.patch b/meta/recipes-devtools/binutils/binutils/fix-pr16428a.patch
new file mode 100644
index 0000000000..5b3edfbd03
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/fix-pr16428a.patch
@@ -0,0 +1,75 @@
+From d1ec1e40b5b457c92aaa23f7af40e026e4596a99 Mon Sep 17 00:00:00 2001
+From: H.J. Lu <hjl.tools@gmail.com>
+Date: Tue, 14 Jan 2014 10:48:39 -0800
+Subject: [PATCH 1/1] Don't update reloc count if there are any non pc-relative relocs
+
+	PR ld/16428
+	* elf32-i386.c (elf_i386_allocate_dynrelocs): Don't update reloc
+	count if there are any non pc-relative relocs.
+	* elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise.
+---
+ bfd/ChangeLog      |    7 +++++++
+ bfd/elf32-i386.c   |    9 +++++++--
+ bfd/elf64-x86-64.c |    9 +++++++--
+ 3 files changed, 21 insertions(+), 4 deletions(-)
+
+Upstream-Status: Backport
+
+#diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+#index a8f1f94..7a49fd1 100644
+#--- a/bfd/ChangeLog
+#+++ b/bfd/ChangeLog
+#@@ -1,3 +1,10 @@
+#+2014-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+#+
+#+	PR ld/16428
+#+	* elf32-i386.c (elf_i386_allocate_dynrelocs): Don't update reloc
+#+	count if there are any non pc-relative relocs.
+#+	* elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise.
+#+
+# 2014-01-14  Michael Hudson-Doyle  <michael.hudson@linaro.org>
+# 	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+# 
+diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
+index 4d391e1..d7f59e5 100644
+--- a/bfd/elf32-i386.c
++++ b/bfd/elf32-i386.c
+@@ -2368,8 +2368,13 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+ 
+ 	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+ 	    {
+-	      p->count -= p->pc_count;
+-	      p->pc_count = 0;
++	      /* Don't update reloc count if there are any non
++		 pc-relative relocs.  */
++	      if (!h->pointer_equality_needed)
++		{
++		  p->count -= p->pc_count;
++		  p->pc_count = 0;
++		}
+ 	      if (p->count == 0)
+ 		*pp = p->next;
+ 	      else
+diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
+index edee8ec..999011b 100644
+--- a/bfd/elf64-x86-64.c
++++ b/bfd/elf64-x86-64.c
+@@ -2463,8 +2463,13 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
+ 
+ 	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+ 	    {
+-	      p->count -= p->pc_count;
+-	      p->pc_count = 0;
++	      /* Don't update reloc count if there are any non
++		 pc-relative relocs.  */
++	      if (!h->pointer_equality_needed)
++		{
++		  p->count -= p->pc_count;
++		  p->pc_count = 0;
++		}
+ 	      if (p->count == 0)
+ 		*pp = p->next;
+ 	      else
+-- 
+1.7.1
+
diff --git a/meta/recipes-devtools/binutils/binutils/fix-pr16428b.patch b/meta/recipes-devtools/binutils/binutils/fix-pr16428b.patch
new file mode 100644
index 0000000000..35aa7b577d
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/fix-pr16428b.patch
@@ -0,0 +1,75 @@
+From 818d220a6fe3d0512a226188e9164245a02c9185 Mon Sep 17 00:00:00 2001
+From: H.J. Lu <hjl.tools@gmail.com>
+Date: Tue, 14 Jan 2014 16:42:35 -0800
+Subject: [PATCH] Don't discard relocs against __ehdr_start
+
+__ehdr_start will be defined by assign_file_positions_for_non_load_sections
+later.
+
+	PR ld/16428
+	* elf32-i386.c (elf_i386_allocate_dynrelocs): Don't discard relocs
+	against __ehdr_start.
+	* elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise.
+---
+ bfd/ChangeLog      |    7 +++++++
+ bfd/elf32-i386.c   |    7 +++++--
+ bfd/elf64-x86-64.c |    7 +++++--
+ 3 files changed, 17 insertions(+), 4 deletions(-)
+
+Upstream-Status: Backport
+
+#diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+#index 7d13a35..f4acda0 100644
+#--- a/bfd/ChangeLog
+#+++ b/bfd/ChangeLog
+#@@ -1,5 +1,12 @@
+# 2014-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+# 
+#+	PR ld/16428
+#+	* elf32-i386.c (elf_i386_allocate_dynrelocs): Don't discard relocs
+#+	against __ehdr_start.
+#+	* elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise.
+#+
+#+2014-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+#+
+# 	* elf32-i386.c (elf_i386_allocate_dynrelocs): Revert the last
+# 	change.
+# 	* elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise.
+Index: binutils-2.24/bfd/elf32-i386.c
+===================================================================
+--- binutils-2.24.orig/bfd/elf32-i386.c	2014-03-25 10:26:54.818385608 +0000
++++ binutils-2.24/bfd/elf32-i386.c	2014-03-25 10:26:54.814385607 +0000
+@@ -2395,9 +2395,12 @@
+ 	}
+ 
+       /* Also discard relocs on undefined weak syms with non-default
+-    	 visibility.  */
++    	 visibility.   Don't discard relocs against __ehdr_start which
++	 will be defined by assign_file_positions_for_non_load_sections
++	 later.  */
+       if (eh->dyn_relocs != NULL
+-	  && h->root.type == bfd_link_hash_undefweak)
++	  && h->root.type == bfd_link_hash_undefweak
++	  && strcmp (h->root.root.string, "__ehdr_start") != 0)
+ 	{
+ 	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+ 	    eh->dyn_relocs = NULL;
+Index: binutils-2.24/bfd/elf64-x86-64.c
+===================================================================
+--- binutils-2.24.orig/bfd/elf64-x86-64.c	2014-03-25 10:26:54.818385608 +0000
++++ binutils-2.24/bfd/elf64-x86-64.c	2014-03-25 10:26:54.814385607 +0000
+@@ -2478,9 +2478,12 @@
+ 	}
+ 
+       /* Also discard relocs on undefined weak syms with non-default
+-	 visibility.  */
++    	 visibility.   Don't discard relocs against __ehdr_start which
++	 will be defined by assign_file_positions_for_non_load_sections
++	 later.  */
+       if (eh->dyn_relocs != NULL
+-	  && h->root.type == bfd_link_hash_undefweak)
++	  && h->root.type == bfd_link_hash_undefweak
++	  && strcmp (h->root.root.string, "__ehdr_start") != 0)
+ 	{
+ 	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+ 	    eh->dyn_relocs = NULL;