patches/binutils/2.17/150-check_ldrunpath_length.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu Oct 07 22:37:06 2010 +0200 (2010-10-07)
changeset 2138 2242d87c5404
parent 745 e445c00d134d
permissions -rw-r--r--
scripts: always create lib32 and lib64 symlinks

Unconditionally create the lib32 -> lib/ and lib64 -> lib/ symlinks.

This is reportedly a fix to build a toolchain for a 32-bit target on
a 'pure' 64-bit host (eg. on Fedora FC12, host libs are in lib64/,
and there is no lib -> lib64 symlink, as we can see on other distors,
as Debian). As gcc only puts static host lib in lib64/ (along with
target files in subdirs), we can safely create the symlinks.

Also note that the symlinks are summarily removed at the end
of the build.

Signed-off-by: Anthony Foiani <anthony.foiani@gmail.com>
[Yann E. MORIN: fix a comment, rephrase the commit log]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@55
     1
diff -dur binutils-2.17.old/ld/emultempl/elf32.em binutils-2.17/ld/emultempl/elf32.em
yann@55
     2
--- binutils-2.17.old/ld/emultempl/elf32.em	2006-06-12 15:05:04.000000000 +0200
yann@55
     3
+++ binutils-2.17/ld/emultempl/elf32.em	2007-05-01 18:26:13.000000000 +0200
yann@55
     4
@@ -970,6 +970,8 @@
yann@55
     5
 	      && command_line.rpath == NULL)
yann@55
     6
 	    {
yann@55
     7
 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
yann@55
     8
+	      if ((lib_path) && (strlen (lib_path) == 0))
yann@55
     9
+		  lib_path = NULL;
yann@55
    10
 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
yann@55
    11
 						      force))
yann@55
    12
 		break;
yann@55
    13
@@ -1154,6 +1156,8 @@
yann@55
    14
   rpath = command_line.rpath;
yann@55
    15
   if (rpath == NULL)
yann@55
    16
     rpath = (const char *) getenv ("LD_RUN_PATH");
yann@55
    17
+  if ((rpath) && (strlen (rpath) == 0))
yann@55
    18
+      rpath = NULL;
yann@55
    19
   if (! (bfd_elf_size_dynamic_sections
yann@55
    20
 	 (output_bfd, command_line.soname, rpath,
yann@55
    21
 	  command_line.filter_shlib,