From eba28c52f0e2ccc0f985c120611817d6a9155892 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 7 Mar 2009 11:20:27 +0000 Subject: Re-diff the binutils-2.18.50.0.4 patches. Breakage spotted by "Sander Visser" /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(-) diff --git a/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch b/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch index c3f9e77..bf37211 100644 --- a/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch +++ b/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch @@ -1,13 +1,18 @@ +Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch + +-= BEGIN original header =- Patch from buildroot, updated to binutils-2.18.50.0.6. binutils-2.18.50.0.6/configure | 2 1 1 0 +- binutils-2.18.50.0.6/configure.ac | 2 1 1 0 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff -durN binutils-2.18.50.0.6.orig/configure binutils-2.18.50.0.6/configure ---- binutils-2.18.50.0.6.orig/configure 2008-04-03 18:54:04.000000000 +0200 -+++ binutils-2.18.50.0.6/configure 2008-05-02 23:18:42.000000000 +0200 -@@ -2298,7 +2298,7 @@ +-= END original header =- + +diff -durN binutils-2.18.50.0.4.orig/configure binutils-2.18.50.0.4/configure +--- binutils-2.18.50.0.4.orig/configure 2008-02-08 17:44:09.000000000 +0100 ++++ binutils-2.18.50.0.4/configure 2009-03-07 12:17:29.000000000 +0100 +@@ -2249,7 +2249,7 @@ noconfigdirs="$noconfigdirs target-libffi target-qthreads" libgloss_dir=arm ;; @@ -16,10 +21,10 @@ diff -durN binutils-2.18.50.0.6.orig/configure binutils-2.18.50.0.6/configure noconfigdirs="$noconfigdirs target-qthreads" noconfigdirs="$noconfigdirs target-libobjc" case ${with_newlib} in -diff -durN binutils-2.18.50.0.6.orig/configure.ac binutils-2.18.50.0.6/configure.ac ---- binutils-2.18.50.0.6.orig/configure.ac 2008-04-03 18:54:04.000000000 +0200 -+++ binutils-2.18.50.0.6/configure.ac 2008-05-02 23:18:01.000000000 +0200 -@@ -560,7 +560,7 @@ +diff -durN binutils-2.18.50.0.4.orig/configure.ac binutils-2.18.50.0.4/configure.ac +--- binutils-2.18.50.0.4.orig/configure.ac 2008-02-08 17:44:09.000000000 +0100 ++++ binutils-2.18.50.0.4/configure.ac 2009-03-07 12:17:30.000000000 +0100 +@@ -526,7 +526,7 @@ noconfigdirs="$noconfigdirs target-libffi target-qthreads" libgloss_dir=arm ;; diff --git a/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch b/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch index 9eea2a1..99b02f7 100644 --- a/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch +++ b/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch @@ -1,12 +1,17 @@ +Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch + +-= BEGIN original header =- Fix ld scripts path, copied from buildroot. binutils-2.18.50.0.6/ld/Makefile.am | 2 1 1 0 +- binutils-2.18.50.0.6/ld/Makefile.in | 2 1 1 0 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.am binutils-2.18.50.0.6/ld/Makefile.am ---- binutils-2.18.50.0.6.orig/ld/Makefile.am 2008-04-03 18:54:05.000000000 +0200 -+++ binutils-2.18.50.0.6/ld/Makefile.am 2008-05-02 23:25:14.000000000 +0200 +-= END original header =- + +diff -durN binutils-2.18.50.0.4.orig/ld/Makefile.am binutils-2.18.50.0.4/ld/Makefile.am +--- binutils-2.18.50.0.4.orig/ld/Makefile.am 2007-11-03 21:40:37.000000000 +0100 ++++ binutils-2.18.50.0.4/ld/Makefile.am 2009-03-07 12:17:30.000000000 +0100 @@ -18,7 +18,7 @@ # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR @@ -16,10 +21,10 @@ diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.am binutils-2.18.50.0.6/ld/Make EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ -diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.in binutils-2.18.50.0.6/ld/Makefile.in ---- binutils-2.18.50.0.6.orig/ld/Makefile.in 2008-04-03 18:54:05.000000000 +0200 -+++ binutils-2.18.50.0.6/ld/Makefile.in 2008-05-02 23:25:14.000000000 +0200 -@@ -288,7 +288,7 @@ +diff -durN binutils-2.18.50.0.4.orig/ld/Makefile.in binutils-2.18.50.0.4/ld/Makefile.in +--- binutils-2.18.50.0.4.orig/ld/Makefile.in 2007-11-03 21:40:37.000000000 +0100 ++++ binutils-2.18.50.0.4/ld/Makefile.in 2009-03-07 12:17:30.000000000 +0100 +@@ -287,7 +287,7 @@ # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch b/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch index 7b3e7e1..edde04a 100644 --- a/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch +++ b/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch @@ -1,11 +1,16 @@ +Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch + +-= BEGIN original header =- Check LD_RUN_PATH length, copied from buildroot. binutils-2.18.50.0.6/ld/emultempl/elf32.em | 4 4 0 0 ++++ 1 file changed, 4 insertions(+) -diff -durN binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em binutils-2.18.50.0.6/ld/emultempl/elf32.em ---- binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em 2008-04-03 18:54:25.000000000 +0200 -+++ binutils-2.18.50.0.6/ld/emultempl/elf32.em 2008-05-02 23:30:08.000000000 +0200 +-= END original header =- + +diff -durN binutils-2.18.50.0.4.orig/ld/emultempl/elf32.em binutils-2.18.50.0.4/ld/emultempl/elf32.em +--- binutils-2.18.50.0.4.orig/ld/emultempl/elf32.em 2008-02-08 17:44:55.000000000 +0100 ++++ binutils-2.18.50.0.4/ld/emultempl/elf32.em 2009-03-07 12:17:31.000000000 +0100 @@ -1220,6 +1220,8 @@ && command_line.rpath == NULL) { @@ -15,12 +20,12 @@ diff -durN binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em binutils-2.18.50.0.6/ if (gld${EMULATION_NAME}_search_needed (lib_path, &n, force)) break; -@@ -1405,6 +1407,8 @@ +@@ -1404,6 +1406,8 @@ rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH"); + if ((rpath) && (strlen (rpath) == 0)) + rpath = NULL; if (! (bfd_elf_size_dynamic_sections - (link_info.output_bfd, command_line.soname, rpath, + (output_bfd, command_line.soname, rpath, command_line.filter_shlib, diff --git a/patches/binutils/2.18.50.0.4/130-i386-no-divide-comment.patch b/patches/binutils/2.18.50.0.4/130-i386-no-divide-comment.patch index f0d7bb8..cb34192 100644 --- a/patches/binutils/2.18.50.0.4/130-i386-no-divide-comment.patch +++ b/patches/binutils/2.18.50.0.4/130-i386-no-divide-comment.patch @@ -1,6 +1,11 @@ +Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.18.50.0.4/130-i386-no-divide-comment.patch + +-= BEGIN original header =- +-= END original header =- + 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 --- binutils-2.18.50.0.4.orig/gas/config/tc-i386.c 2008-02-08 17:44:10.000000000 +0100 -+++ binutils-2.18.50.0.4/gas/config/tc-i386.c 2008-09-22 09:08:03.000000000 +0200 ++++ binutils-2.18.50.0.4/gas/config/tc-i386.c 2009-03-07 12:17:31.000000000 +0100 @@ -300,24 +300,10 @@ #endif ; -- cgit v0.10.2-6-g49f6