diff options
author | Alexey Neyman <stilor@att.net> | 2020-02-26 11:07:59 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-26 11:07:59 -0800 |
commit | c969be1880f99b6da4d98afd7bda641b7868a717 (patch) | |
tree | 3e128f23f3098cfaf6d15aa8d8950074f96e5f13 /packages/binutils/2.34/0007-sysroot.patch | |
parent | b56c868175780326ce39a8201c0e4ad178fa06ac (diff) | |
parent | d978290f39196e7c2c72a154f32681386b4e27b8 (diff) | |
download | crosstool-ng-c969be1880f99b6da4d98afd7bda641b7868a717.tar.gz crosstool-ng-c969be1880f99b6da4d98afd7bda641b7868a717.tar.bz2 crosstool-ng-c969be1880f99b6da4d98afd7bda641b7868a717.zip |
Merge pull request #1309 from stilor/upgrades
Upgrades
Diffstat (limited to 'packages/binutils/2.34/0007-sysroot.patch')
-rw-r--r-- | packages/binutils/2.34/0007-sysroot.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/packages/binutils/2.34/0007-sysroot.patch b/packages/binutils/2.34/0007-sysroot.patch new file mode 100644 index 00000000..3ddf687a --- /dev/null +++ b/packages/binutils/2.34/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 +@@ -339,18 +339,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)) |