1.1 --- a/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch Mon Jul 28 21:32:33 2008 +0000
1.2 +++ b/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch Wed Aug 19 19:44:44 2009 +0200
1.3 @@ -1,11 +1,16 @@
1.4 +Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.18.50.0.4/120-check-ldrunpath-length.patch
1.5 +
1.6 +-= BEGIN original header =-
1.7 Check LD_RUN_PATH length, copied from buildroot.
1.8
1.9 binutils-2.18.50.0.6/ld/emultempl/elf32.em | 4 4 0 0 ++++
1.10 1 file changed, 4 insertions(+)
1.11
1.12 -diff -durN binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em binutils-2.18.50.0.6/ld/emultempl/elf32.em
1.13 ---- binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em 2008-04-03 18:54:25.000000000 +0200
1.14 -+++ binutils-2.18.50.0.6/ld/emultempl/elf32.em 2008-05-02 23:30:08.000000000 +0200
1.15 +-= END original header =-
1.16 +
1.17 +diff -durN binutils-2.18.50.0.4.orig/ld/emultempl/elf32.em binutils-2.18.50.0.4/ld/emultempl/elf32.em
1.18 +--- binutils-2.18.50.0.4.orig/ld/emultempl/elf32.em 2008-02-08 17:44:55.000000000 +0100
1.19 ++++ binutils-2.18.50.0.4/ld/emultempl/elf32.em 2009-03-07 12:17:31.000000000 +0100
1.20 @@ -1220,6 +1220,8 @@
1.21 && command_line.rpath == NULL)
1.22 {
1.23 @@ -15,12 +20,12 @@
1.24 if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
1.25 force))
1.26 break;
1.27 -@@ -1405,6 +1407,8 @@
1.28 +@@ -1404,6 +1406,8 @@
1.29 rpath = command_line.rpath;
1.30 if (rpath == NULL)
1.31 rpath = (const char *) getenv ("LD_RUN_PATH");
1.32 + if ((rpath) && (strlen (rpath) == 0))
1.33 + rpath = NULL;
1.34 if (! (bfd_elf_size_dynamic_sections
1.35 - (link_info.output_bfd, command_line.soname, rpath,
1.36 + (output_bfd, command_line.soname, rpath,
1.37 command_line.filter_shlib,