From 5b3e2c8fd8b93cba7ee05ffe610a0134a60805a7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Fri, 2 May 2008 21:51:14 +0000 Subject: Remove some EXPERIMENTAL binutils versions, I do not have time to create associated patches. /trunk/patches/binutils/2.18.50.0.4/200-ld-makefile-path.patch | 30 30 0 0 ++++++++++ /trunk/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch | 30 30 0 0 ++++++++++ /trunk/patches/binutils/2.18.50.0.4/300-check-ldrunpath-length.patch | 26 26 0 0 +++++++++ /trunk/patches/binutils/2.18.50.0.6/200-ld-makefile-path.patch | 30 30 0 0 ++++++++++ /trunk/patches/binutils/2.18.50.0.6/100-arm-uclibcgnueabi.patch | 30 30 0 0 ++++++++++ /trunk/patches/binutils/2.18.50.0.6/300-check-ldrunpath-length.patch | 26 26 0 0 +++++++++ /trunk/config/binutils.in | 24 0 24 0 -------- 7 files changed, 172 insertions(+), 24 deletions(-) diff --git a/config/binutils.in b/config/binutils.in index 8d0af90..6d58fd8 100644 --- a/config/binutils.in +++ b/config/binutils.in @@ -31,31 +31,11 @@ config BINUTILS_V_2_18 bool prompt "2.18" -config BINUTILS_V_2_18_50_0_1 - bool - prompt "2.18.50.0.1 (EXPERIMENTAL)" - depends on EXPERIMENTAL - -config BINUTILS_V_2_18_50_0_2 - bool - prompt "2.18.50.0.2 (EXPERIMENTAL)" - depends on EXPERIMENTAL - -config BINUTILS_V_2_18_50_0_3 - bool - prompt "2.18.50.0.3 (EXPERIMENTAL)" - depends on EXPERIMENTAL - config BINUTILS_V_2_18_50_0_4 bool prompt "2.18.50.0.4 (EXPERIMENTAL)" depends on EXPERIMENTAL -config BINUTILS_V_2_18_50_0_5 - bool - prompt "2.18.50.0.5 (EXPERIMENTAL)" - depends on EXPERIMENTAL - config BINUTILS_V_2_18_50_0_6 bool prompt "2.18.50.0.6 (EXPERIMENTAL)" @@ -72,11 +52,7 @@ config BINUTILS_VERSION default "2.16.1" if BINUTILS_V_2_16_1 default "2.17" if BINUTILS_V_2_17 default "2.18" if BINUTILS_V_2_18 - default "2.18.50.0.1" if BINUTILS_V_2_18_50_0_1 - default "2.18.50.0.2" if BINUTILS_V_2_18_50_0_2 - default "2.18.50.0.3" if BINUTILS_V_2_18_50_0_3 default "2.18.50.0.4" if BINUTILS_V_2_18_50_0_4 - default "2.18.50.0.5" if BINUTILS_V_2_18_50_0_5 default "2.18.50.0.6" if BINUTILS_V_2_18_50_0_6 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! 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 new file mode 100644 index 0000000..c3f9e77 --- /dev/null +++ b/patches/binutils/2.18.50.0.4/100-arm-uclibcgnueabi.patch @@ -0,0 +1,30 @@ +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 @@ + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + libgloss_dir=arm + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + 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 @@ + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + libgloss_dir=arm + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-qthreads" + noconfigdirs="$noconfigdirs target-libobjc" + case ${with_newlib} in diff --git a/patches/binutils/2.18.50.0.4/200-ld-makefile-path.patch b/patches/binutils/2.18.50.0.4/200-ld-makefile-path.patch new file mode 100644 index 0000000..9eea2a1 --- /dev/null +++ b/patches/binutils/2.18.50.0.4/200-ld-makefile-path.patch @@ -0,0 +1,30 @@ +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 +@@ -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 + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + 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 @@ + # 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. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/patches/binutils/2.18.50.0.4/300-check-ldrunpath-length.patch b/patches/binutils/2.18.50.0.4/300-check-ldrunpath-length.patch new file mode 100644 index 0000000..7b3e7e1 --- /dev/null +++ b/patches/binutils/2.18.50.0.4/300-check-ldrunpath-length.patch @@ -0,0 +1,26 @@ +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 +@@ -1220,6 +1220,8 @@ + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -1405,6 +1407,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, + command_line.filter_shlib, diff --git a/patches/binutils/2.18.50.0.6/100-arm-uclibcgnueabi.patch b/patches/binutils/2.18.50.0.6/100-arm-uclibcgnueabi.patch new file mode 100644 index 0000000..c3f9e77 --- /dev/null +++ b/patches/binutils/2.18.50.0.6/100-arm-uclibcgnueabi.patch @@ -0,0 +1,30 @@ +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 @@ + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + libgloss_dir=arm + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + 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 @@ + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + libgloss_dir=arm + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-qthreads" + noconfigdirs="$noconfigdirs target-libobjc" + case ${with_newlib} in diff --git a/patches/binutils/2.18.50.0.6/200-ld-makefile-path.patch b/patches/binutils/2.18.50.0.6/200-ld-makefile-path.patch new file mode 100644 index 0000000..9eea2a1 --- /dev/null +++ b/patches/binutils/2.18.50.0.6/200-ld-makefile-path.patch @@ -0,0 +1,30 @@ +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 +@@ -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 + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + 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 @@ + # 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. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/patches/binutils/2.18.50.0.6/300-check-ldrunpath-length.patch b/patches/binutils/2.18.50.0.6/300-check-ldrunpath-length.patch new file mode 100644 index 0000000..7b3e7e1 --- /dev/null +++ b/patches/binutils/2.18.50.0.6/300-check-ldrunpath-length.patch @@ -0,0 +1,26 @@ +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 +@@ -1220,6 +1220,8 @@ + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -1405,6 +1407,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, + command_line.filter_shlib, -- cgit v0.10.2-6-g49f6