summaryrefslogtreecommitdiff
path: root/patches/binutils/2.20.1/130-ld-sysroot.patch
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-08-17 17:48:49 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-08-17 17:48:49 (GMT)
commit3e2f9f3f860aeec80e9b71ff8f2a7f841ea3810a (patch)
tree3fb3ea09fb2914d30e862ac4180e8ac0d4c7bb77 /patches/binutils/2.20.1/130-ld-sysroot.patch
parentd53f1d71f6c0ef75be48e1082d8d1e8cfc493d9e (diff)
binutils/binutils: forward-port the patchset from 2.20 to 2.20.1
Among other things, this should fix the issue reported by Thomas at: http://sourceware.org/ml/crossgcc/2010-08/msg00115.html Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'patches/binutils/2.20.1/130-ld-sysroot.patch')
-rw-r--r--patches/binutils/2.20.1/130-ld-sysroot.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/patches/binutils/2.20.1/130-ld-sysroot.patch b/patches/binutils/2.20.1/130-ld-sysroot.patch
new file mode 100644
index 0000000..4a40c40
--- /dev/null
+++ b/patches/binutils/2.20.1/130-ld-sysroot.patch
@@ -0,0 +1,37 @@
+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
+
+diff -durN binutils-2.20.1.orig/ld/ldfile.c binutils-2.20.1/ld/ldfile.c
+--- binutils-2.20.1.orig/ld/ldfile.c 2009-08-30 00:11:01.000000000 +0200
++++ binutils-2.20.1/ld/ldfile.c 2010-08-17 19:32:08.000000000 +0200
+@@ -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);