Re-diff the binutils-2.18.50.0.4 patches.
Breakage spotted by "Sander Visser" <Sander.Visser@evidente.se>
/trunk/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch | 19 12 7 0 ++++++---
/trunk/patches/binutils/2.18.50.0.4/130-i386-no-divide-comment.patch | 7 6 1 0 +++
/trunk/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch | 21 13 8 0 ++++++----
/trunk/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch | 15 10 5 0 +++++--
4 files changed, 41 insertions(+), 21 deletions(-)
1.1 --- a/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch Sat Mar 07 11:05:37 2009 +0000
1.2 +++ b/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch Sat Mar 07 11:20:27 2009 +0000
1.3 @@ -1,13 +1,18 @@
1.4 +Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch
1.5 +
1.6 +-= BEGIN original header =-
1.7 Patch from buildroot, updated to binutils-2.18.50.0.6.
1.8
1.9 binutils-2.18.50.0.6/configure | 2 1 1 0 +-
1.10 binutils-2.18.50.0.6/configure.ac | 2 1 1 0 +-
1.11 2 files changed, 2 insertions(+), 2 deletions(-)
1.12
1.13 -diff -durN binutils-2.18.50.0.6.orig/configure binutils-2.18.50.0.6/configure
1.14 ---- binutils-2.18.50.0.6.orig/configure 2008-04-03 18:54:04.000000000 +0200
1.15 -+++ binutils-2.18.50.0.6/configure 2008-05-02 23:18:42.000000000 +0200
1.16 -@@ -2298,7 +2298,7 @@
1.17 +-= END original header =-
1.18 +
1.19 +diff -durN binutils-2.18.50.0.4.orig/configure binutils-2.18.50.0.4/configure
1.20 +--- binutils-2.18.50.0.4.orig/configure 2008-02-08 17:44:09.000000000 +0100
1.21 ++++ binutils-2.18.50.0.4/configure 2009-03-07 12:17:29.000000000 +0100
1.22 +@@ -2249,7 +2249,7 @@
1.23 noconfigdirs="$noconfigdirs target-libffi target-qthreads"
1.24 libgloss_dir=arm
1.25 ;;
1.26 @@ -16,10 +21,10 @@
1.27 noconfigdirs="$noconfigdirs target-qthreads"
1.28 noconfigdirs="$noconfigdirs target-libobjc"
1.29 case ${with_newlib} in
1.30 -diff -durN binutils-2.18.50.0.6.orig/configure.ac binutils-2.18.50.0.6/configure.ac
1.31 ---- binutils-2.18.50.0.6.orig/configure.ac 2008-04-03 18:54:04.000000000 +0200
1.32 -+++ binutils-2.18.50.0.6/configure.ac 2008-05-02 23:18:01.000000000 +0200
1.33 -@@ -560,7 +560,7 @@
1.34 +diff -durN binutils-2.18.50.0.4.orig/configure.ac binutils-2.18.50.0.4/configure.ac
1.35 +--- binutils-2.18.50.0.4.orig/configure.ac 2008-02-08 17:44:09.000000000 +0100
1.36 ++++ binutils-2.18.50.0.4/configure.ac 2009-03-07 12:17:30.000000000 +0100
1.37 +@@ -526,7 +526,7 @@
1.38 noconfigdirs="$noconfigdirs target-libffi target-qthreads"
1.39 libgloss_dir=arm
1.40 ;;
2.1 --- a/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch Sat Mar 07 11:05:37 2009 +0000
2.2 +++ b/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch Sat Mar 07 11:20:27 2009 +0000
2.3 @@ -1,12 +1,17 @@
2.4 +Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch
2.5 +
2.6 +-= BEGIN original header =-
2.7 Fix ld scripts path, copied from buildroot.
2.8
2.9 binutils-2.18.50.0.6/ld/Makefile.am | 2 1 1 0 +-
2.10 binutils-2.18.50.0.6/ld/Makefile.in | 2 1 1 0 +-
2.11 2 files changed, 2 insertions(+), 2 deletions(-)
2.12
2.13 -diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.am binutils-2.18.50.0.6/ld/Makefile.am
2.14 ---- binutils-2.18.50.0.6.orig/ld/Makefile.am 2008-04-03 18:54:05.000000000 +0200
2.15 -+++ binutils-2.18.50.0.6/ld/Makefile.am 2008-05-02 23:25:14.000000000 +0200
2.16 +-= END original header =-
2.17 +
2.18 +diff -durN binutils-2.18.50.0.4.orig/ld/Makefile.am binutils-2.18.50.0.4/ld/Makefile.am
2.19 +--- binutils-2.18.50.0.4.orig/ld/Makefile.am 2007-11-03 21:40:37.000000000 +0100
2.20 ++++ binutils-2.18.50.0.4/ld/Makefile.am 2009-03-07 12:17:30.000000000 +0100
2.21 @@ -18,7 +18,7 @@
2.22 # We put the scripts in the directory $(scriptdir)/ldscripts.
2.23 # We can't put the scripts in $(datadir) because the SEARCH_DIR
2.24 @@ -16,10 +21,10 @@
2.25
2.26 EMUL = @EMUL@
2.27 EMULATION_OFILES = @EMULATION_OFILES@
2.28 -diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.in binutils-2.18.50.0.6/ld/Makefile.in
2.29 ---- binutils-2.18.50.0.6.orig/ld/Makefile.in 2008-04-03 18:54:05.000000000 +0200
2.30 -+++ binutils-2.18.50.0.6/ld/Makefile.in 2008-05-02 23:25:14.000000000 +0200
2.31 -@@ -288,7 +288,7 @@
2.32 +diff -durN binutils-2.18.50.0.4.orig/ld/Makefile.in binutils-2.18.50.0.4/ld/Makefile.in
2.33 +--- binutils-2.18.50.0.4.orig/ld/Makefile.in 2007-11-03 21:40:37.000000000 +0100
2.34 ++++ binutils-2.18.50.0.4/ld/Makefile.in 2009-03-07 12:17:30.000000000 +0100
2.35 +@@ -287,7 +287,7 @@
2.36 # We put the scripts in the directory $(scriptdir)/ldscripts.
2.37 # We can't put the scripts in $(datadir) because the SEARCH_DIR
2.38 # directives need to be different for native and cross linkers.
3.1 --- a/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch Sat Mar 07 11:05:37 2009 +0000
3.2 +++ b/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch Sat Mar 07 11:20:27 2009 +0000
3.3 @@ -1,11 +1,16 @@
3.4 +Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch
3.5 +
3.6 +-= BEGIN original header =-
3.7 Check LD_RUN_PATH length, copied from buildroot.
3.8
3.9 binutils-2.18.50.0.6/ld/emultempl/elf32.em | 4 4 0 0 ++++
3.10 1 file changed, 4 insertions(+)
3.11
3.12 -diff -durN binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em binutils-2.18.50.0.6/ld/emultempl/elf32.em
3.13 ---- binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em 2008-04-03 18:54:25.000000000 +0200
3.14 -+++ binutils-2.18.50.0.6/ld/emultempl/elf32.em 2008-05-02 23:30:08.000000000 +0200
3.15 +-= END original header =-
3.16 +
3.17 +diff -durN binutils-2.18.50.0.4.orig/ld/emultempl/elf32.em binutils-2.18.50.0.4/ld/emultempl/elf32.em
3.18 +--- binutils-2.18.50.0.4.orig/ld/emultempl/elf32.em 2008-02-08 17:44:55.000000000 +0100
3.19 ++++ binutils-2.18.50.0.4/ld/emultempl/elf32.em 2009-03-07 12:17:31.000000000 +0100
3.20 @@ -1220,6 +1220,8 @@
3.21 && command_line.rpath == NULL)
3.22 {
3.23 @@ -15,12 +20,12 @@
3.24 if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
3.25 force))
3.26 break;
3.27 -@@ -1405,6 +1407,8 @@
3.28 +@@ -1404,6 +1406,8 @@
3.29 rpath = command_line.rpath;
3.30 if (rpath == NULL)
3.31 rpath = (const char *) getenv ("LD_RUN_PATH");
3.32 + if ((rpath) && (strlen (rpath) == 0))
3.33 + rpath = NULL;
3.34 if (! (bfd_elf_size_dynamic_sections
3.35 - (link_info.output_bfd, command_line.soname, rpath,
3.36 + (output_bfd, command_line.soname, rpath,
3.37 command_line.filter_shlib,
4.1 --- a/patches/binutils/2.18.50.0.4/130-i386-no-divide-comment.patch Sat Mar 07 11:05:37 2009 +0000
4.2 +++ b/patches/binutils/2.18.50.0.4/130-i386-no-divide-comment.patch Sat Mar 07 11:20:27 2009 +0000
4.3 @@ -1,6 +1,11 @@
4.4 +Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.18.50.0.4/130-i386-no-divide-comment.patch
4.5 +
4.6 +-= BEGIN original header =-
4.7 +-= END original header =-
4.8 +
4.9 diff -durN binutils-2.18.50.0.4.orig/gas/config/tc-i386.c binutils-2.18.50.0.4/gas/config/tc-i386.c
4.10 --- binutils-2.18.50.0.4.orig/gas/config/tc-i386.c 2008-02-08 17:44:10.000000000 +0100
4.11 -+++ binutils-2.18.50.0.4/gas/config/tc-i386.c 2008-09-22 09:08:03.000000000 +0200
4.12 ++++ binutils-2.18.50.0.4/gas/config/tc-i386.c 2009-03-07 12:17:31.000000000 +0100
4.13 @@ -300,24 +300,10 @@
4.14 #endif
4.15 ;