patches/binutils/2.22/300-012_check_ldrunpath_length.patch
author Johannes Stezenbach <js@sig21.net>
Tue Oct 30 00:36:20 2012 +0000 (2012-10-30)
changeset 3096 d1766c2273d1
permissions -rw-r--r--
scripts/functions: use patch -i instead of IO redirection

This makes the patch name show up on the command line
logged by CT_DoExecLog so it's easier to see
what is going on. The -i for patch is specified
by Posix and supported by GNU patch and busybox patch.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
[yann.morin.1998@free.fr: remove now-useless debug message]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <20121030103620.GB8303@sig21.net>
Patchwork-Id: 195418
     1 diff -durN binutils-2.22.orig/ld/emultempl/elf32.em binutils-2.22/ld/emultempl/elf32.em
     2 --- binutils-2.22.orig/ld/emultempl/elf32.em	2011-11-21 10:29:39.000000000 +0100
     3 +++ binutils-2.22/ld/emultempl/elf32.em	2011-12-14 19:52:12.880783238 +0100
     4 @@ -1273,6 +1273,8 @@
     5  	      && command_line.rpath == NULL)
     6  	    {
     7  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
     8 +	      if ((lib_path) && (strlen (lib_path) == 0))
     9 +	      	lib_path = NULL;
    10  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
    11  						      force))
    12  		break;
    13 @@ -1500,6 +1502,8 @@
    14    rpath = command_line.rpath;
    15    if (rpath == NULL)
    16      rpath = (const char *) getenv ("LD_RUN_PATH");
    17 +  if ((rpath) && (strlen (rpath) == 0))
    18 +  	rpath = NULL;
    19  
    20    for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
    21      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)