diff options
author | Bryan Hundven <bryanhundven@gmail.com> | 2016-02-05 11:13:28 (GMT) |
---|---|---|
committer | Bryan Hundven <bryanhundven@gmail.com> | 2016-02-05 11:13:28 (GMT) |
commit | ce83329f4da559ebaf0210ec821da541cb62bc49 (patch) | |
tree | 34fec4c2080db23b90fb05c7d9ba93481e7fe7c8 /patches/binutils/2.26/500-sysroot.patch | |
parent | 6702ff8debf1bc1357cb16cddedb4a2087c80d22 (diff) | |
parent | 46c9c486d02953deb130c427fce1286498f285ff (diff) |
Merge pull request #331 from bhundven/update_binutils
binutils: Add binutils-2.26
Diffstat (limited to 'patches/binutils/2.26/500-sysroot.patch')
-rw-r--r-- | patches/binutils/2.26/500-sysroot.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/patches/binutils/2.26/500-sysroot.patch b/patches/binutils/2.26/500-sysroot.patch new file mode 100644 index 0000000..e49c795 --- /dev/null +++ b/patches/binutils/2.26/500-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 + +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -308,18 +308,25 @@ + directory first. */ + if (! entry->flags.maybe_archive) + { +- if (entry->flags.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->flags.sysrooted = is_sysrooted_pathname (entry->filename); ++ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) ++ && ld_sysroot) + { + char *name = concat (ld_sysroot, entry->filename, + (const char *) NULL); + if (ldfile_try_open_bfd (name, entry)) + { + entry->filename = name; ++ entry->flags.sysrooted = TRUE; + return TRUE; + } + free (name); + } +- else if (ldfile_try_open_bfd (entry->filename, entry)) ++ ++ if (ldfile_try_open_bfd (entry->filename, entry)) + return TRUE; + + if (IS_ABSOLUTE_PATH (entry->filename)) |