diff options
| author |   Bryan Hundven <bryanhundven@gmail.com> | 2016-02-05 11:13:28 (GMT) |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2016-02-05 11:13:28 (GMT) |
| commit | ce83329f4da559ebaf0210ec821da541cb62bc49 (patch) | |
| tree | 34fec4c2080db23b90fb05c7d9ba93481e7fe7c8 /patches/binutils/2.26/300-012_check_ldrunpath_length.patch | |
| parent | 6702ff8debf1bc1357cb16cddedb4a2087c80d22 (diff) | |
| parent | 46c9c486d02953deb130c427fce1286498f285ff (diff) | |
Merge pull request #331 from bhundven/update_binutils
binutils: Add binutils-2.26
Diffstat (limited to 'patches/binutils/2.26/300-012_check_ldrunpath_length.patch')
| -rw-r--r-- | patches/binutils/2.26/300-012_check_ldrunpath_length.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/binutils/2.26/300-012_check_ldrunpath_length.patch b/patches/binutils/2.26/300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000..f1f31af --- /dev/null +++ b/patches/binutils/2.26/300-012_check_ldrunpath_length.patch @@ -0,0 +1,22 @@ +diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em +index 137446f..bb8391a 100644 +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -1195,6 +1195,8 @@ fragment <<EOF + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void) + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (*rpath == '\0')) ++ rpath = NULL; + + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) |