From: Chris Chimelis <chris@debian.org>
Date: Thu, 6 Feb 2020 17:10:11 +0000 (+0000)
Subject: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
X-Git-Tag: archive/raspbian/2.34-4+rpi2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5083abf30a9c9b43317644e277f2eea3062ae676;p=binutils.git

Only generate an RPATH entry if LD_RUN_PATH is not empty, for

cases where -rpath isn't specified. (#151024)

Gbp-Pq: Name 012_check_ldrunpath_length.patch
---

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 1ad9d6b6f..d9b3d26b4 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1471,6 +1471,8 @@ fragment <<EOF
 	      && command_line.rpath == NULL)
 	    {
 	      path = (const char *) getenv ("LD_RUN_PATH");
+	      if ((path) && (strlen (path) == 0))
+		path = NULL;
 	      if (path
 		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
 		break;
@@ -1751,6 +1753,8 @@ gld${EMULATION_NAME}_before_allocation (void)
   rpath = command_line.rpath;
   if (rpath == NULL)
     rpath = (const char *) getenv ("LD_RUN_PATH");
+  if ((rpath) && (strlen (rpath) == 0))
+      rpath = NULL;
 
   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)