1 files changed, 39 insertions, 0 deletions

diff --git a/meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch b/meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch
new file mode 100644
index 0000000000..1a640eac39
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch
@@ -0,0 +1,39 @@
+Upstream-Status: Pending
+
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+Index: binutils-2.21/ld/ldfile.c
+===================================================================
+--- binutils-2.21.orig/ld/ldfile.c
++++ binutils-2.21/ld/ldfile.c
+@@ -372,18 +372,24 @@ ldfile_open_file_search (const char *arc
+      directory first.  */
+   if (! entry->is_archive)
+     {
+-      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++      /* For absolute pathnames, try to always open the file in the
++        sysroot first. If this fails, try to open the file at the
++        given location. */
++      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
++      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
+        {
+          char *name = concat (ld_sysroot, entry->filename,
+                               (const char *) NULL);
+          if (ldfile_try_open_bfd (name, entry))
+            {
+              entry->filename = name;
++             entry->sysrooted = TRUE;
+              return TRUE;
+            }
+          free (name);
+        }
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++
++      if (ldfile_try_open_bfd (entry->filename, entry))
+        {
+          entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+            && is_sysrooted_pathname (entry->filename, TRUE);