From ba4cef66514fff84afe8a04b866eba0172193ae4 Mon Sep 17 00:00:00 2001
From: Jasmin Jessich <jasmin@anw.at>
Date: Mon, 24 Aug 2015 00:12:43 +0200
Subject: Adding patches for binutils version 2.25.1 as copy of 2.25. Support
 binutils 2.25.1 in configuration. Note: The patches do apply, but I didn't
 check the resulting tools.

Signed-off-by: Jasmin Jessich <jasmin@anw.at>
---
 .../2.25.1/300-012_check_ldrunpath_length.patch    | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 patches/binutils/2.25.1/300-012_check_ldrunpath_length.patch

(limited to 'patches/binutils/2.25.1/300-012_check_ldrunpath_length.patch')

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 00000000..f1f31af9
--- /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)
-- 
cgit v1.2.3