summaryrefslogtreecommitdiff
path: root/patches/binutils/2.20/130-ld-sysroot.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/binutils/2.20/130-ld-sysroot.patch')
-rw-r--r--patches/binutils/2.20/130-ld-sysroot.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/patches/binutils/2.20/130-ld-sysroot.patch b/patches/binutils/2.20/130-ld-sysroot.patch
new file mode 100644
index 0000000..ddf95b1
--- /dev/null
+++ b/patches/binutils/2.20/130-ld-sysroot.patch
@@ -0,0 +1,36 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- ld/ldfile.c
++++ ld/ldfile.c
+@@ -308,18 +308,24 @@
+ 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);