patches/binutils/2.17.50.0.18/300-012_check_ldrunpath_length.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Aug 12 08:05:57 2007 +0000 (2007-08-12)
changeset 325 58e56ab91bd0
parent 314 patches/binutils/2.17.50.0.17/300-012_check_ldrunpath_length.patch@60a7282ec3c4
permissions -rw-r--r--
Add experimental binutils-2.17.50.0.18, along with patches from previous snapshot.
yann@314
     1
diff -u binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em binutils-2.17.50.0.17/ld/emultempl/elf32.em
yann@314
     2
--- binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em	2007-06-18 19:31:40.000000000 +0200
yann@314
     3
+++ binutils-2.17.50.0.17/ld/emultempl/elf32.em	2007-06-25 10:01:25.000000000 +0200
yann@314
     4
@@ -1007,6 +1007,8 @@
yann@314
     5
 	      && command_line.rpath == NULL)
yann@314
     6
 	    {
yann@314
     7
 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
yann@314
     8
+	      if ((lib_path) && (strlen (lib_path) == 0))
yann@314
     9
+		  lib_path = NULL;
yann@314
    10
 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
yann@314
    11
 						      force))
yann@314
    12
 		break;
yann@314
    13
@@ -1191,6 +1193,8 @@
yann@314
    14
   rpath = command_line.rpath;
yann@314
    15
   if (rpath == NULL)
yann@314
    16
     rpath = (const char *) getenv ("LD_RUN_PATH");
yann@314
    17
+  if ((rpath) && (strlen (rpath) == 0))
yann@314
    18
+      rpath = NULL;
yann@314
    19
   if (! (bfd_elf_size_dynamic_sections
yann@314
    20
 	 (output_bfd, command_line.soname, rpath,
yann@314
    21
 	  command_line.filter_shlib,