summaryrefslogtreecommitdiff
path: root/patches/binutils/2.28/500-sysroot.patch
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-03-04 03:13:26 (GMT)
committerGitHub <noreply@github.com>2017-03-04 03:13:26 (GMT)
commitdedfe6905a7e90933097c345be5cbc743b060622 (patch)
tree1e1b040b1b6c7dc02e5ef650e847b0a02a63aff4 /patches/binutils/2.28/500-sysroot.patch
parent0b895560198f61d28af494973bd9ca5181db9970 (diff)
parent69f95de8b030bf03f08ffdd54bac8192a23625e5 (diff)
Merge pull request #630 from stilor/upgrades
Final batch of updates before 1.23
Diffstat (limited to 'patches/binutils/2.28/500-sysroot.patch')
-rw-r--r--patches/binutils/2.28/500-sysroot.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/patches/binutils/2.28/500-sysroot.patch b/patches/binutils/2.28/500-sysroot.patch
new file mode 100644
index 0000000..4cb9bc7
--- /dev/null
+++ b/patches/binutils/2.28/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
+@@ -336,18 +336,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))