diff options
author | Alexey Neyman <stilor@att.net> | 2017-10-06 05:32:53 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-06 05:32:53 (GMT) |
commit | 42429d9169720b2c3ae791780580538de237efe0 (patch) | |
tree | e0379ed45e1858f80cd2fa2120f4bee49caa19d4 /packages/binutils/2.29.1/300-012_check_ldrunpath_length.patch | |
parent | 626abb9614d36c02ace6e4c4427efac4499ce752 (diff) | |
parent | 3cafb8d7b5991a68433f775ae1113550028eba69 (diff) |
Merge pull request #841 from bhundven/update_binutils_2_29_1
[binutils] Add 2.29.1
Diffstat (limited to 'packages/binutils/2.29.1/300-012_check_ldrunpath_length.patch')
-rw-r--r-- | packages/binutils/2.29.1/300-012_check_ldrunpath_length.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/packages/binutils/2.29.1/300-012_check_ldrunpath_length.patch b/packages/binutils/2.29.1/300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000..c1d5a97 --- /dev/null +++ b/packages/binutils/2.29.1/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) + { + 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; +@@ -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) |