[PATCH 1 of 1] patches/binutils/2.20: make patches appliable

Frederic Roussel fr.frasc@gmail.com
Wed Nov 11 22:52:00 GMT 2009


# HG changeset patch
# User "Frederic Roussel" <fr.frasc@gmail.com>
# Date 1257979493 28800
# Node ID 60446d2e5660ca85a6f1b31bc2abf30b98657f0b
# Parent  187e06178dcbe8a15147bb057e7242d5dccd8309
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>

diff -r 187e06178dcb -r 60446d2e5660 patches/binutils/2.20/100-ppc64-pie.patch
--- a/patches/binutils/2.20/100-ppc64-pie.patch	Fri Oct 30 20:08:44 2009 +0100
+++ b/patches/binutils/2.20/100-ppc64-pie.patch	Wed Nov 11 14:44:53 2009 -0800
@@ -1,5 +1,5 @@
---- bfd/elf64-ppc.c.jj	2004-09-27 16:46:06.000000000 -0400
-+++ bfd/elf64-ppc.c	2004-10-04 09:09:50.000000000 -0400
+--- binutils/bfd/elf64-ppc.c.jj	2004-09-27 16:46:06.000000000 -0400
++++ binutils/bfd/elf64-ppc.c	2004-10-04 09:09:50.000000000 -0400
 @@ -9681,7 +9681,12 @@ ppc64_elf_relocate_section (bfd *output_
  	      else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf)
  		       && !is_opd
diff -r 187e06178dcb -r 60446d2e5660 patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch
--- a/patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch	Fri Oct 30 20:08:44 2009 +0100
+++ b/patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch	Wed Nov 11 14:44:53 2009 -0800
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/binutils/2007-07/msg00401.html
 http://sourceware.org/bugzilla/show_bug.cgi?id=4970
 
---- configure
-+++ configure
+--- binutils/configure
++++ binutils/configure
 @@ -5601,6 +5601,7 @@ case "${host}" in
    *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
    *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
diff -r 187e06178dcb -r 60446d2e5660 patches/binutils/2.20/120-sh-targets.patch
--- a/patches/binutils/2.20/120-sh-targets.patch	Fri Oct 30 20:08:44 2009 +0100
+++ b/patches/binutils/2.20/120-sh-targets.patch	Wed Nov 11 14:44:53 2009 -0800
@@ -1,22 +1,15 @@
-r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
-
-Likewise, binutils has no idea about any of these new targets either, so we 
-fix that up too.. now we're able to actually build a real toolchain for 
-sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
-inept targets than that one, really. Go look, I promise).
-
---- binutils-2.16.90.0.2-dist/configure
-+++ binutils-2.16.90.0.2/configure
-@@ -1207,7 +1207,7 @@
+--- binutils-2.20-dist/configure
++++ binutils-2.20/configure
+@@ -3054,7 +3054,7 @@
    am33_2.0-*-linux*)
      noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
      ;;
 -  sh-*-linux*)
 +  sh*-*-linux*)
      noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;    
+     ;;
    sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -1495,7 +1495,7 @@
+@@ -3390,7 +3390,7 @@
    romp-*-*)
      noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
      ;;
@@ -25,8 +18,8 @@
      case "${host}" in
        i[3456789]86-*-vsta) ;; # don't add gprof back in
        i[3456789]86-*-go32*) ;; # don't add gprof back in
---- binutils-2.16.90.0.2-dist/configure.ac
-+++ binutils-2.16.90.0.2/configure.ac
+--- binutils-2.20-dist/configure.ac
++++ binutils-2.20/configure.ac
 @@ -424,7 +424,7 @@
    am33_2.0-*-linux*)
      noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
diff -r 187e06178dcb -r 60446d2e5660 patches/binutils/2.20/130-ld-sysroot.patch
--- a/patches/binutils/2.20/130-ld-sysroot.patch	Fri Oct 30 20:08:44 2009 +0100
+++ b/patches/binutils/2.20/130-ld-sysroot.patch	Wed Nov 11 14:44:53 2009 -0800
@@ -5,8 +5,8 @@
 http://bugs.gentoo.org/275666
 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
---- ld/ldfile.c
-+++ ld/ldfile.c
+--- binutils/ld/ldfile.c
++++ binutils/ld/ldfile.c
 @@ -308,18 +308,24 @@
       directory first.  */
    if (! entry->is_archive)
diff -r 187e06178dcb -r 60446d2e5660 patches/binutils/2.20/140-check_ldrunpath_length.patch
--- a/patches/binutils/2.20/140-check_ldrunpath_length.patch	Fri Oct 30 20:08:44 2009 +0100
+++ b/patches/binutils/2.20/140-check_ldrunpath_length.patch	Wed Nov 11 14:44:53 2009 -0800
@@ -26,7 +26,7 @@
 @DPATCH@
 diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
 --- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:58.000000000 +0100
-+++ binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:59.000000000 +0100
++++ binutils-2.20/ld/emultempl/elf32.em	2004-05-21 23:12:59.000000000 +0100
 @@ -692,6 +692,8 @@
  	      && command_line.rpath == NULL)
  	    {
@@ -43,5 +43,5 @@
 +  if ((rpath) && (strlen (rpath) == 0))
 +      rpath = NULL;
    if (! (bfd_elf_size_dynamic_sections
- 	 (output_bfd, command_line.soname, rpath,
+ 	 (link_info.output_bfd, command_line.soname, rpath,
  	  command_line.filter_shlib,
diff -r 187e06178dcb -r 60446d2e5660 patches/binutils/2.20/170-warn-textrel.patch
--- a/patches/binutils/2.20/170-warn-textrel.patch	Fri Oct 30 20:08:44 2009 +0100
+++ b/patches/binutils/2.20/170-warn-textrel.patch	Wed Nov 11 14:44:53 2009 -0800
@@ -10,8 +10,8 @@
 	* ld/testsuite/lib/ld-lib.exp (default_ld_simple_link): Scrub TEXTREL
 	warnings from ld output.
 
---- bfd/elflink.c
-+++ bfd/elflink.c
+--- binutils/bfd/elflink.c
++++ binutils/bfd/elflink.c
 @@ -8652,14 +8652,12 @@
  	goto error_return;
  
@@ -38,14 +38,14 @@
  		  break;
  		}
  	    }
---- ld/ldmain.c
-+++ ld/ldmain.c
+--- binutils/ld/ldmain.c
++++ binutils/ld/ldmain.c
 @@ -282,2 +282,3 @@ main (int argc, char **argv)
    link_info.spare_dynamic_tags = 5;
 +  link_info.warn_shared_textrel = TRUE;
    link_info.sharable_sections = FALSE;
---- ld/testsuite/lib/ld-lib.exp
-+++ ld/testsuite/lib/ld-lib.exp
+--- binutils/ld/testsuite/lib/ld-lib.exp
++++ binutils/ld/testsuite/lib/ld-lib.exp
 @@ -181,6 +181,10 @@ proc default_ld_simple_link { ld target 
      # symbol, since the default linker script might use ENTRY.
      regsub -all "(^|\n)(\[^\n\]*: warning: cannot find entry symbol\[^\n\]*\n?)" $exec_output "\\1" exec_output
diff -r 187e06178dcb -r 60446d2e5660 patches/binutils/2.20/230-libiberty-pic.patch
--- a/patches/binutils/2.20/230-libiberty-pic.patch	Fri Oct 30 20:08:44 2009 +0100
+++ b/patches/binutils/2.20/230-libiberty-pic.patch	Wed Nov 11 14:44:53 2009 -0800
@@ -1,5 +1,5 @@
---- libiberty/Makefile.in.mps	2004-05-13 15:53:17.000000000 +0200
-+++ libiberty/Makefile.in	2004-05-13 15:52:53.000000000 +0200
+--- binutils/libiberty/Makefile.in.mps	2004-05-13 15:53:17.000000000 +0200
++++ binutils/libiberty/Makefile.in	2004-05-13 15:52:53.000000000 +0200
 @@ -224,6 +224,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA
  	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
  	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \

--
For unsubscribe information see http://sourceware.org/lists.html#faq



More information about the crossgcc mailing list