diff options
author | Alexey Neyman <stilor@att.net> | 2017-01-10 18:36:23 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-10 18:36:23 (GMT) |
commit | abdaa36b5ab0a46055248bc437d0f74183984d78 (patch) | |
tree | 251acfdd28203230bbc2d39370fd9c93515f01cd /patches/binutils/2.27/500-sysroot.patch | |
parent | a2d49174dffdb9e33aa6cb53da16d84824fd4ed6 (diff) | |
parent | e427a6408f61a1950ad2dfa5ac32853dcb391be7 (diff) |
Merge pull request #515 from InfernoEmbedded/arm-toolchain-update
Arm toolchain update
Diffstat (limited to 'patches/binutils/2.27/500-sysroot.patch')
-rw-r--r-- | patches/binutils/2.27/500-sysroot.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/patches/binutils/2.27/500-sysroot.patch b/patches/binutils/2.27/500-sysroot.patch new file mode 100644 index 0000000..4cb9bc7 --- /dev/null +++ b/patches/binutils/2.27/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)) |