| From 3bd211025c890ef2971958915d500a9bb2913a2a Mon Sep 17 00:00:00 2001 |
| From: Romain Naour <romain.naour@gmail.com> |
| Date: Fri, 25 Dec 2015 11:41:47 +0100 |
| Subject: [PATCH] check-ldrunpath-length |
| |
| [Romain: rebase on top of 2.26] |
| Signed-off-by: Romain Naour <romain.naour@gmail.com> |
| --- |
| ld/emultempl/elf32.em | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em |
| index d2551b6..70fcb56 100644 |
| --- a/ld/emultempl/elf32.em |
| +++ b/ld/emultempl/elf32.em |
| @@ -1463,6 +1463,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; |
| @@ -1740,6 +1742,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) |
| -- |
| 2.9.4 |
| |
