From 6c882486475e1253c5143134207edd816f44afbb Mon Sep 17 00:00:00 2001 From: Frederic Roussel Date: Wed, 11 Nov 2009 14:44:53 -0800 Subject: 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 diff --git a/patches/binutils/2.20/100-ppc64-pie.patch b/patches/binutils/2.20/100-ppc64-pie.patch index 879ea91..20918a5 100644 --- a/patches/binutils/2.20/100-ppc64-pie.patch +++ b/patches/binutils/2.20/100-ppc64-pie.patch @@ -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 --git a/patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch b/patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch index efa0ec9..cf84e25 100644 --- a/patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch +++ b/patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch @@ -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 --git a/patches/binutils/2.20/120-sh-targets.patch b/patches/binutils/2.20/120-sh-targets.patch index 4379ede..ca1a1f7 100644 --- a/patches/binutils/2.20/120-sh-targets.patch +++ b/patches/binutils/2.20/120-sh-targets.patch @@ -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 @@ inept targets than that one, really. Go look, I promise). 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 --git a/patches/binutils/2.20/130-ld-sysroot.patch b/patches/binutils/2.20/130-ld-sysroot.patch index ddf95b1..9b52a24 100644 --- a/patches/binutils/2.20/130-ld-sysroot.patch +++ b/patches/binutils/2.20/130-ld-sysroot.patch @@ -5,8 +5,8 @@ Always try to prepend the sysroot prefix to absolute filenames first. 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 --git a/patches/binutils/2.20/140-check_ldrunpath_length.patch b/patches/binutils/2.20/140-check_ldrunpath_length.patch index 498651a..fce6ae1 100644 --- a/patches/binutils/2.20/140-check_ldrunpath_length.patch +++ b/patches/binutils/2.20/140-check_ldrunpath_length.patch @@ -26,7 +26,7 @@ exit 0 @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 @@ diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/ + 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 --git a/patches/binutils/2.20/170-warn-textrel.patch b/patches/binutils/2.20/170-warn-textrel.patch index d8560fe..0d7596a 100644 --- a/patches/binutils/2.20/170-warn-textrel.patch +++ b/patches/binutils/2.20/170-warn-textrel.patch @@ -10,8 +10,8 @@ the very fact that they're needed at all. * 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 @@ the very fact that they're needed at all. 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 --git a/patches/binutils/2.20/230-libiberty-pic.patch b/patches/binutils/2.20/230-libiberty-pic.patch index 214c44b..fcce13d 100644 --- a/patches/binutils/2.20/230-libiberty-pic.patch +++ b/patches/binutils/2.20/230-libiberty-pic.patch @@ -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); \ -- cgit v0.10.2-6-g49f6