1.1 --- a/config/binutils/binutils.in Sun Sep 11 18:18:53 2011 +0200
1.2 +++ b/config/binutils/binutils.in Sun Sep 11 19:54:57 2011 +0200
1.3 @@ -8,6 +8,11 @@
1.4 # Don't remove next line
1.5 # CT_INSERT_VERSION_BELOW
1.6
1.7 +config BINUTILS_V_2_21_1a
1.8 + bool
1.9 + prompt "2.21.1a"
1.10 + select BINUTILS_2_21_or_later
1.11 +
1.12 config BINUTILS_V_2_20_1a
1.13 bool
1.14 prompt "2.20.1a"
1.15 @@ -39,6 +44,7 @@
1.16 string
1.17 # Don't remove next line
1.18 # CT_INSERT_VERSION_STRING_BELOW
1.19 + default "2.21.1a" if BINUTILS_V_2_21_1a
1.20 default "2.20.1a" if BINUTILS_V_2_20_1a
1.21 default "2.19.1a" if BINUTILS_V_2_19_1a
1.22 default "2.18a" if BINUTILS_V_2_18a
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/patches/binutils/2.21.1a/110-arm-eabi-conf.patch Sun Sep 11 19:54:57 2011 +0200
2.3 @@ -0,0 +1,24 @@
2.4 +diff -durN binutils-2.21.1.orig/configure binutils-2.21.1/configure
2.5 +--- binutils-2.21.1.orig/configure 2011-06-27 09:39:00.000000000 +0200
2.6 ++++ binutils-2.21.1/configure 2011-09-12 13:39:06.292251293 +0200
2.7 +@@ -3180,7 +3180,7 @@
2.8 + noconfigdirs="$noconfigdirs target-libffi target-qthreads"
2.9 + libgloss_dir=arm
2.10 + ;;
2.11 +- arm*-*-linux-gnueabi)
2.12 ++ arm*-*-linux-*gnueabi)
2.13 + noconfigdirs="$noconfigdirs target-qthreads"
2.14 + case ${with_newlib} in
2.15 + no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
2.16 +diff -durN binutils-2.21.1.orig/configure.ac binutils-2.21.1/configure.ac
2.17 +--- binutils-2.21.1.orig/configure.ac 2011-06-27 11:08:53.000000000 +0200
2.18 ++++ binutils-2.21.1/configure.ac 2011-09-12 13:39:06.308917895 +0200
2.19 +@@ -652,7 +652,7 @@
2.20 + noconfigdirs="$noconfigdirs target-libffi target-qthreads"
2.21 + libgloss_dir=arm
2.22 + ;;
2.23 +- arm*-*-linux-gnueabi)
2.24 ++ arm*-*-linux-*gnueabi)
2.25 + noconfigdirs="$noconfigdirs target-qthreads"
2.26 + case ${with_newlib} in
2.27 + no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/patches/binutils/2.21.1a/120-sh-conf.patch Sun Sep 11 19:54:57 2011 +0200
3.3 @@ -0,0 +1,42 @@
3.4 +diff -durN binutils-2.21.1.orig/configure binutils-2.21.1/configure
3.5 +--- binutils-2.21.1.orig/configure 2011-09-12 13:39:06.292251293 +0200
3.6 ++++ binutils-2.21.1/configure 2011-09-12 13:39:07.135581381 +0200
3.7 +@@ -3148,7 +3148,7 @@
3.8 + am33_2.0-*-linux*)
3.9 + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
3.10 + ;;
3.11 +- sh-*-linux*)
3.12 ++ sh*-*-linux*)
3.13 + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
3.14 + ;;
3.15 + sh*-*-pe|mips*-*-pe|*arm-wince-pe)
3.16 +@@ -3487,7 +3487,7 @@
3.17 + romp-*-*)
3.18 + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
3.19 + ;;
3.20 +- sh-*-* | sh64-*-*)
3.21 ++ sh*-*-* | sh64-*-*)
3.22 + case "${host}" in
3.23 + i[3456789]86-*-vsta) ;; # don't add gprof back in
3.24 + i[3456789]86-*-go32*) ;; # don't add gprof back in
3.25 +diff -durN binutils-2.21.1.orig/configure.ac binutils-2.21.1/configure.ac
3.26 +--- binutils-2.21.1.orig/configure.ac 2011-09-12 13:39:06.308917895 +0200
3.27 ++++ binutils-2.21.1/configure.ac 2011-09-12 13:39:07.145581342 +0200
3.28 +@@ -620,7 +620,7 @@
3.29 + am33_2.0-*-linux*)
3.30 + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
3.31 + ;;
3.32 +- sh-*-linux*)
3.33 ++ sh*-*-linux*)
3.34 + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
3.35 + ;;
3.36 + sh*-*-pe|mips*-*-pe|*arm-wince-pe)
3.37 +@@ -959,7 +959,7 @@
3.38 + romp-*-*)
3.39 + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
3.40 + ;;
3.41 +- sh-*-* | sh64-*-*)
3.42 ++ sh*-*-* | sh64-*-*)
3.43 + case "${host}" in
3.44 + i[[3456789]]86-*-vsta) ;; # don't add gprof back in
3.45 + i[[3456789]]86-*-go32*) ;; # don't add gprof back in
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/patches/binutils/2.21.1a/300-001_ld_makefile_patch.patch Sun Sep 11 19:54:57 2011 +0200
4.3 @@ -0,0 +1,24 @@
4.4 +diff -durN binutils-2.21.1.orig/ld/Makefile.am binutils-2.21.1/ld/Makefile.am
4.5 +--- binutils-2.21.1.orig/ld/Makefile.am 2011-03-16 09:37:30.000000000 +0100
4.6 ++++ binutils-2.21.1/ld/Makefile.am 2011-09-12 13:39:07.962244866 +0200
4.7 +@@ -37,7 +37,7 @@
4.8 + # We put the scripts in the directory $(scriptdir)/ldscripts.
4.9 + # We can't put the scripts in $(datadir) because the SEARCH_DIR
4.10 + # directives need to be different for native and cross linkers.
4.11 +-scriptdir = $(tooldir)/lib
4.12 ++scriptdir = $(libdir)
4.13 +
4.14 + EMUL = @EMUL@
4.15 + EMULATION_OFILES = @EMULATION_OFILES@
4.16 +diff -durN binutils-2.21.1.orig/ld/Makefile.in binutils-2.21.1/ld/Makefile.in
4.17 +--- binutils-2.21.1.orig/ld/Makefile.in 2011-03-16 09:37:30.000000000 +0100
4.18 ++++ binutils-2.21.1/ld/Makefile.in 2011-09-12 13:39:07.962244866 +0200
4.19 +@@ -365,7 +365,7 @@
4.20 + # We put the scripts in the directory $(scriptdir)/ldscripts.
4.21 + # We can't put the scripts in $(datadir) because the SEARCH_DIR
4.22 + # directives need to be different for native and cross linkers.
4.23 +-scriptdir = $(tooldir)/lib
4.24 ++scriptdir = $(libdir)
4.25 + BASEDIR = $(srcdir)/..
4.26 + BFDDIR = $(BASEDIR)/bfd
4.27 + INCDIR = $(BASEDIR)/include
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/patches/binutils/2.21.1a/300-012_check_ldrunpath_length.patch Sun Sep 11 19:54:57 2011 +0200
5.3 @@ -0,0 +1,21 @@
5.4 +diff -durN binutils-2.21.1.orig/ld/emultempl/elf32.em binutils-2.21.1/ld/emultempl/elf32.em
5.5 +--- binutils-2.21.1.orig/ld/emultempl/elf32.em 2011-06-27 09:39:14.000000000 +0200
5.6 ++++ binutils-2.21.1/ld/emultempl/elf32.em 2011-09-12 13:39:08.808908274 +0200
5.7 +@@ -1272,6 +1272,8 @@
5.8 + && command_line.rpath == NULL)
5.9 + {
5.10 + lib_path = (const char *) getenv ("LD_RUN_PATH");
5.11 ++ if ((lib_path) && (strlen (lib_path) == 0))
5.12 ++ lib_path = NULL;
5.13 + if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
5.14 + force))
5.15 + break;
5.16 +@@ -1499,6 +1501,8 @@
5.17 + rpath = command_line.rpath;
5.18 + if (rpath == NULL)
5.19 + rpath = (const char *) getenv ("LD_RUN_PATH");
5.20 ++ if ((rpath) && (strlen (rpath) == 0))
5.21 ++ rpath = NULL;
5.22 +
5.23 + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
5.24 + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)