patches/binutils/2.18.50.0.8/120-check-ldrunpath-length.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Mar 03 17:41:59 2009 +0000 (2009-03-03)
changeset 1219 2b875ed306c2
parent 652 bed1088fd34d
permissions -rw-r--r--
Allow user to add a directory component in the sys-root path.
Rename CT_DEBUG_INSTALL_DIR to CT_DEBUGROOT_DIR (to match CT_SYSROOT_DIR).
As a side effect, fix creating lib64->lib symlinks.

/trunk/scripts/build/debug/100-dmalloc.sh | 2 1 1 0 +-
/trunk/scripts/build/debug/400-ltrace.sh | 2 1 1 0 +-
/trunk/scripts/build/debug/300-gdb.sh | 6 3 3 0 +++---
/trunk/scripts/build/debug/500-strace.sh | 2 1 1 0 +-
/trunk/scripts/build/debug/200-duma.sh | 6 3 3 0 +++---
/trunk/scripts/crosstool-NG.sh.in | 16 7 9 0 +++++++---------
/trunk/scripts/functions | 2 1 1 0 +-
/trunk/config/toolchain.in | 17 17 0 0 +++++++++++++++++
8 files changed, 34 insertions(+), 19 deletions(-)
yann@652
     1
diff -durN binutils-2.18.50.0.8.orig/ld/emultempl/elf32.em binutils-2.18.50.0.8/ld/emultempl/elf32.em
yann@652
     2
--- binutils-2.18.50.0.8.orig/ld/emultempl/elf32.em	2008-07-10 17:33:23.000000000 +0200
yann@652
     3
+++ binutils-2.18.50.0.8/ld/emultempl/elf32.em	2008-07-13 23:19:29.000000000 +0200
yann@652
     4
@@ -1220,6 +1220,8 @@
yann@652
     5
 	      && command_line.rpath == NULL)
yann@652
     6
 	    {
yann@652
     7
 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
yann@652
     8
+	      if ((lib_path) && (strlen (lib_path) == 0))
yann@652
     9
+		  lib_path = NULL;
yann@652
    10
 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
yann@652
    11
 						      force))
yann@652
    12
 		break;
yann@652
    13
@@ -1405,6 +1407,8 @@
yann@652
    14
   rpath = command_line.rpath;
yann@652
    15
   if (rpath == NULL)
yann@652
    16
     rpath = (const char *) getenv ("LD_RUN_PATH");
yann@652
    17
+  if ((rpath) && (strlen (rpath) == 0))
yann@652
    18
+      rpath = NULL;
yann@652
    19
   if (! (bfd_elf_size_dynamic_sections
yann@652
    20
 	 (link_info.output_bfd, command_line.soname, rpath,
yann@652
    21
 	  command_line.filter_shlib,