summaryrefslogtreecommitdiff
path: root/patches/binutils/2.25/300-012_check_ldrunpath_length.patch
diff options
context:
space:
mode:
authorBryan Hundven <bryanhundven@gmail.com>2015-01-02 00:19:11 (GMT)
committerBryan Hundven <bryanhundven@gmail.com>2015-01-02 00:19:11 (GMT)
commitb49e2331675bb50c2973fe913c33e336f866eba8 (patch)
treed9f8efe4e967af0eea3e3db3eac04d2f78cf0329 /patches/binutils/2.25/300-012_check_ldrunpath_length.patch
parent11ae33951a4981ebe3c52a351e437a3b7a07f6cd (diff)
binutils: Add binutils-2.25
This also updates the patches from 2.24. Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'patches/binutils/2.25/300-012_check_ldrunpath_length.patch')
-rw-r--r--patches/binutils/2.25/300-012_check_ldrunpath_length.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/binutils/2.25/300-012_check_ldrunpath_length.patch b/patches/binutils/2.25/300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000..16365b9
--- /dev/null
+++ b/patches/binutils/2.25/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) && (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)