patches/binutils/2.19/100-ppc64-pie.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jan 25 17:53:14 2009 +0000 (2009-01-25)
changeset 1150 218f7a0e8d71
permissions -rw-r--r--
On 20090120.2203+0100, Andy Johnson <ajohnson@aecno.com> wrote:
The glibc.sh script doesn't handle the glibc versions with
an underscore very well (bash expected integer error). I
have attached a small patch for that. Instead of looking
for "not period" I changed the sense to look for numbers.
I initially tried to make it look for either a period or
an underscore, but that didn't work like I wanted (probably
because I did something wrong).

Original patch modified to be more robust.

/trunk/scripts/build/libc/glibc.sh | 8 4 4 0 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
yann@1069
     1
Original patch from Gentoo:
yann@1069
     2
gentoo/src/patchsets/binutils/2.19/03_all_binutils-2.15.92.0.2-ppc64-pie.patch
yann@1069
     3
yann@1069
     4
diff -durN binutils-2.19.orig/bfd/elf64-ppc.c binutils-2.19/bfd/elf64-ppc.c
yann@1069
     5
--- binutils-2.19.orig/bfd/elf64-ppc.c	2008-10-09 14:18:24.000000000 +0200
yann@1069
     6
+++ binutils-2.19/bfd/elf64-ppc.c	2008-11-23 16:16:11.000000000 +0100
yann@1069
     7
@@ -11294,7 +11294,12 @@
yann@1069
     8
 	      else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf)
yann@1069
     9
 		       && !is_opd
yann@1069
    10
 		       && r_type != R_PPC64_TOC)
yann@1069
    11
-		outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
yann@1069
    12
+		{
yann@1069
    13
+		  outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
yann@1069
    14
+		  if (h->elf.dynindx == -1
yann@1069
    15
+		      && h->elf.root.type == bfd_link_hash_undefweak)
yann@1069
    16
+		  memset (&outrel, 0, sizeof outrel);
yann@1069
    17
+		}
yann@1069
    18
 	      else
yann@1069
    19
 		{
yann@1069
    20
 		  /* This symbol is local, or marked to become local,