summaryrefslogtreecommitdiff
path: root/packages/binutils/2.31.1/0007-sysroot.patch
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2018-09-26 04:47:03 (GMT)
committerGitHub <noreply@github.com>2018-09-26 04:47:03 (GMT)
commit49520dbf6d55640974f89becae00fe142f5b9c21 (patch)
tree7c114a60de71b641443f219c28ddbb1bf2b32fa5 /packages/binutils/2.31.1/0007-sysroot.patch
parenteb65ba65ba761f2ff613342498fd58fcefdc606e (diff)
parent581e8a514bf7e7c3fb7df219dca55fae5de044c0 (diff)
Merge pull request #1032 from stilor/updates
Update packages
Diffstat (limited to 'packages/binutils/2.31.1/0007-sysroot.patch')
-rw-r--r--packages/binutils/2.31.1/0007-sysroot.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/packages/binutils/2.31.1/0007-sysroot.patch b/packages/binutils/2.31.1/0007-sysroot.patch
new file mode 100644
index 0000000..ba7940a
--- /dev/null
+++ b/packages/binutils/2.31.1/0007-sysroot.patch
@@ -0,0 +1,41 @@
+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 | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -338,18 +338,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))