diff options
| author |   Bryan Hundven <bryanhundven@gmail.com> | 2015-09-05 23:18:41 (GMT) |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-09-05 23:18:41 (GMT) |
| commit | f4bfca0f64c4d706f0f1882c829d3ca78a025e39 (patch) | |
| tree | 574e23cea59ee229b7ceff69fd2204fe56db9ed6 /patches/binutils/2.25.1/300-012_check_ldrunpath_length.patch | |
| parent | 7fa8e7ba8adfb4b480ed56d1d80bba72ad9b343e (diff) | |
| parent | ba4cef66514fff84afe8a04b866eba0172193ae4 (diff) | |
Merge pull request #151 from jasmin-j/binutils_2_25_1
Support binutils V 2.25.1
Diffstat (limited to 'patches/binutils/2.25.1/300-012_check_ldrunpath_length.patch')
| -rw-r--r-- | patches/binutils/2.25.1/300-012_check_ldrunpath_length.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/binutils/2.25.1/300-012_check_ldrunpath_length.patch b/patches/binutils/2.25.1/300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000..f1f31af --- /dev/null +++ b/patches/binutils/2.25.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) + { + 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) |