summaryrefslogtreecommitdiffstats
path: root/package/binutils/binutils-2.22
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-05-14 01:22:48 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2012-10-21 22:11:45 +0200
commit6bcb68694f50cdc788114c77bdc7ed1ba39e0bef (patch)
treecabbc2966f55a179fcc5583f00cf90fb5b87835a /package/binutils/binutils-2.22
parent0c5e24d48bdd63ce55cc8fb2b00f05b501876a60 (diff)
downloadbuildroot-novena-6bcb68694f50cdc788114c77bdc7ed1ba39e0bef.tar.gz
buildroot-novena-6bcb68694f50cdc788114c77bdc7ed1ba39e0bef.zip
binutils: add sysroot fix from bug #3049
Add binutils ld sysroot bug fix. See http://sourceware.org/bugzilla/show_bug.cgi?id=10340 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/binutils/binutils-2.22')
-rw-r--r--package/binutils/binutils-2.22/500-sysroot.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/package/binutils/binutils-2.22/500-sysroot.patch b/package/binutils/binutils-2.22/500-sysroot.patch
new file mode 100644
index 000000000..d21e4cb10
--- /dev/null
+++ b/package/binutils/binutils-2.22/500-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
+
+--- a/ld/ldfile.c
++++ b/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);