patches/binutils/2.20: make patches appliable
author"Frederic Roussel" <fr.frasc@gmail.com>
Wed Nov 11 14:44:53 2009 -0800 (2009-11-11)
changeset 162160446d2e5660
parent 1620 187e06178dcb
child 1622 9ad2a3fd1fcc
child 1627 8aa1d1051a6a
patches/binutils/2.20: make patches appliable

Fix filenames in patch files for binutils-2.20.
Some patch files were only usable with patch argument '-p0'.
Fix the diff context to match 2.20 release.

Signed-off-by: Frederic Roussel <fr.frasc@gmail.com>
patches/binutils/2.20/100-ppc64-pie.patch
patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch
patches/binutils/2.20/120-sh-targets.patch
patches/binutils/2.20/130-ld-sysroot.patch
patches/binutils/2.20/140-check_ldrunpath_length.patch
patches/binutils/2.20/170-warn-textrel.patch
patches/binutils/2.20/230-libiberty-pic.patch
     1.1 --- a/patches/binutils/2.20/100-ppc64-pie.patch	Fri Oct 30 20:08:44 2009 +0100
     1.2 +++ b/patches/binutils/2.20/100-ppc64-pie.patch	Wed Nov 11 14:44:53 2009 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4 ---- bfd/elf64-ppc.c.jj	2004-09-27 16:46:06.000000000 -0400
     1.5 -+++ bfd/elf64-ppc.c	2004-10-04 09:09:50.000000000 -0400
     1.6 +--- binutils/bfd/elf64-ppc.c.jj	2004-09-27 16:46:06.000000000 -0400
     1.7 ++++ binutils/bfd/elf64-ppc.c	2004-10-04 09:09:50.000000000 -0400
     1.8  @@ -9681,7 +9681,12 @@ ppc64_elf_relocate_section (bfd *output_
     1.9   	      else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf)
    1.10   		       && !is_opd
     2.1 --- a/patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch	Fri Oct 30 20:08:44 2009 +0100
     2.2 +++ b/patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch	Wed Nov 11 14:44:53 2009 -0800
     2.3 @@ -1,8 +1,8 @@
     2.4  http://sourceware.org/ml/binutils/2007-07/msg00401.html
     2.5  http://sourceware.org/bugzilla/show_bug.cgi?id=4970
     2.6  
     2.7 ---- configure
     2.8 -+++ configure
     2.9 +--- binutils/configure
    2.10 ++++ binutils/configure
    2.11  @@ -5601,6 +5601,7 @@ case "${host}" in
    2.12     *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
    2.13     *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
     3.1 --- a/patches/binutils/2.20/120-sh-targets.patch	Fri Oct 30 20:08:44 2009 +0100
     3.2 +++ b/patches/binutils/2.20/120-sh-targets.patch	Wed Nov 11 14:44:53 2009 -0800
     3.3 @@ -1,22 +1,15 @@
     3.4 -r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
     3.5 -
     3.6 -Likewise, binutils has no idea about any of these new targets either, so we 
     3.7 -fix that up too.. now we're able to actually build a real toolchain for 
     3.8 -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
     3.9 -inept targets than that one, really. Go look, I promise).
    3.10 -
    3.11 ---- binutils-2.16.90.0.2-dist/configure
    3.12 -+++ binutils-2.16.90.0.2/configure
    3.13 -@@ -1207,7 +1207,7 @@
    3.14 +--- binutils-2.20-dist/configure
    3.15 ++++ binutils-2.20/configure
    3.16 +@@ -3054,7 +3054,7 @@
    3.17     am33_2.0-*-linux*)
    3.18       noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
    3.19       ;;
    3.20  -  sh-*-linux*)
    3.21  +  sh*-*-linux*)
    3.22       noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
    3.23 -     ;;    
    3.24 +     ;;
    3.25     sh*-*-pe|mips*-*-pe|*arm-wince-pe)
    3.26 -@@ -1495,7 +1495,7 @@
    3.27 +@@ -3390,7 +3390,7 @@
    3.28     romp-*-*)
    3.29       noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
    3.30       ;;
    3.31 @@ -25,8 +18,8 @@
    3.32       case "${host}" in
    3.33         i[3456789]86-*-vsta) ;; # don't add gprof back in
    3.34         i[3456789]86-*-go32*) ;; # don't add gprof back in
    3.35 ---- binutils-2.16.90.0.2-dist/configure.ac
    3.36 -+++ binutils-2.16.90.0.2/configure.ac
    3.37 +--- binutils-2.20-dist/configure.ac
    3.38 ++++ binutils-2.20/configure.ac
    3.39  @@ -424,7 +424,7 @@
    3.40     am33_2.0-*-linux*)
    3.41       noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
     4.1 --- a/patches/binutils/2.20/130-ld-sysroot.patch	Fri Oct 30 20:08:44 2009 +0100
     4.2 +++ b/patches/binutils/2.20/130-ld-sysroot.patch	Wed Nov 11 14:44:53 2009 -0800
     4.3 @@ -5,8 +5,8 @@
     4.4  http://bugs.gentoo.org/275666
     4.5  http://sourceware.org/bugzilla/show_bug.cgi?id=10340
     4.6  
     4.7 ---- ld/ldfile.c
     4.8 -+++ ld/ldfile.c
     4.9 +--- binutils/ld/ldfile.c
    4.10 ++++ binutils/ld/ldfile.c
    4.11  @@ -308,18 +308,24 @@
    4.12        directory first.  */
    4.13     if (! entry->is_archive)
     5.1 --- a/patches/binutils/2.20/140-check_ldrunpath_length.patch	Fri Oct 30 20:08:44 2009 +0100
     5.2 +++ b/patches/binutils/2.20/140-check_ldrunpath_length.patch	Wed Nov 11 14:44:53 2009 -0800
     5.3 @@ -26,7 +26,7 @@
     5.4  @DPATCH@
     5.5  diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
     5.6  --- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:58.000000000 +0100
     5.7 -+++ binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:59.000000000 +0100
     5.8 ++++ binutils-2.20/ld/emultempl/elf32.em	2004-05-21 23:12:59.000000000 +0100
     5.9  @@ -692,6 +692,8 @@
    5.10   	      && command_line.rpath == NULL)
    5.11   	    {
    5.12 @@ -43,5 +43,5 @@
    5.13  +  if ((rpath) && (strlen (rpath) == 0))
    5.14  +      rpath = NULL;
    5.15     if (! (bfd_elf_size_dynamic_sections
    5.16 - 	 (output_bfd, command_line.soname, rpath,
    5.17 + 	 (link_info.output_bfd, command_line.soname, rpath,
    5.18   	  command_line.filter_shlib,
     6.1 --- a/patches/binutils/2.20/170-warn-textrel.patch	Fri Oct 30 20:08:44 2009 +0100
     6.2 +++ b/patches/binutils/2.20/170-warn-textrel.patch	Wed Nov 11 14:44:53 2009 -0800
     6.3 @@ -10,8 +10,8 @@
     6.4  	* ld/testsuite/lib/ld-lib.exp (default_ld_simple_link): Scrub TEXTREL
     6.5  	warnings from ld output.
     6.6  
     6.7 ---- bfd/elflink.c
     6.8 -+++ bfd/elflink.c
     6.9 +--- binutils/bfd/elflink.c
    6.10 ++++ binutils/bfd/elflink.c
    6.11  @@ -8652,14 +8652,12 @@
    6.12   	goto error_return;
    6.13   
    6.14 @@ -38,14 +38,14 @@
    6.15   		  break;
    6.16   		}
    6.17   	    }
    6.18 ---- ld/ldmain.c
    6.19 -+++ ld/ldmain.c
    6.20 +--- binutils/ld/ldmain.c
    6.21 ++++ binutils/ld/ldmain.c
    6.22  @@ -282,2 +282,3 @@ main (int argc, char **argv)
    6.23     link_info.spare_dynamic_tags = 5;
    6.24  +  link_info.warn_shared_textrel = TRUE;
    6.25     link_info.sharable_sections = FALSE;
    6.26 ---- ld/testsuite/lib/ld-lib.exp
    6.27 -+++ ld/testsuite/lib/ld-lib.exp
    6.28 +--- binutils/ld/testsuite/lib/ld-lib.exp
    6.29 ++++ binutils/ld/testsuite/lib/ld-lib.exp
    6.30  @@ -181,6 +181,10 @@ proc default_ld_simple_link { ld target 
    6.31       # symbol, since the default linker script might use ENTRY.
    6.32       regsub -all "(^|\n)(\[^\n\]*: warning: cannot find entry symbol\[^\n\]*\n?)" $exec_output "\\1" exec_output
     7.1 --- a/patches/binutils/2.20/230-libiberty-pic.patch	Fri Oct 30 20:08:44 2009 +0100
     7.2 +++ b/patches/binutils/2.20/230-libiberty-pic.patch	Wed Nov 11 14:44:53 2009 -0800
     7.3 @@ -1,5 +1,5 @@
     7.4 ---- libiberty/Makefile.in.mps	2004-05-13 15:53:17.000000000 +0200
     7.5 -+++ libiberty/Makefile.in	2004-05-13 15:52:53.000000000 +0200
     7.6 +--- binutils/libiberty/Makefile.in.mps	2004-05-13 15:53:17.000000000 +0200
     7.7 ++++ binutils/libiberty/Makefile.in	2004-05-13 15:52:53.000000000 +0200
     7.8  @@ -224,6 +224,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA
     7.9   	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
    7.10   	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \