diff options
Diffstat (limited to 'patches/binutils-2.30/0100-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch')
| -rw-r--r-- | patches/binutils-2.30/0100-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/patches/binutils-2.30/0100-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/patches/binutils-2.30/0100-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch new file mode 100644 index 0000000..9ab7729 --- /dev/null +++ b/patches/binutils-2.30/0100-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -0,0 +1,36 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 1 Nov 2011 16:45:55 +0100 +Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty, for + cases where -rpath isn't specified. + +This is http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=151024 + +This patch is still used in debian binutils 2.30-1 + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + ld/emultempl/elf32.em | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em +index c0925fc9b970..cf6e2fe203e1 100644 +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -1470,6 +1470,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; +@@ -1750,6 +1752,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) |