diff options
author | Hans-Christian Noren Egtvedt <hegtvedt@cisco.com> | 2020-08-05 20:29:09 (GMT) |
---|---|---|
committer | Hans-Christian Noren Egtvedt <hegtvedt@cisco.com> | 2020-08-27 09:35:59 (GMT) |
commit | 793d65899f448ee9b0cf121a170c82f0bc15b854 (patch) | |
tree | ba432b0ae7bf1715bfc41f924c9a1d7b644ef4f2 /packages/binutils/2.35/0007-sysroot.patch | |
parent | 45a01960fc8da60a86091612ebde1808925dc689 (diff) |
Add support for binutils 2.35
Forward ported patches from binutils 2.34, refreshed to match current
sources.
Patch 0008-poison-system-directories.patch did not apply clean and had
minor adjustments to fit new binutils 2.35 release.
Signed-off-by: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
Diffstat (limited to 'packages/binutils/2.35/0007-sysroot.patch')
-rw-r--r-- | packages/binutils/2.35/0007-sysroot.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/packages/binutils/2.35/0007-sysroot.patch b/packages/binutils/2.35/0007-sysroot.patch new file mode 100644 index 0000000..c98f147 --- /dev/null +++ b/packages/binutils/2.35/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 +@@ -340,18 +340,25 @@ ldfile_open_file_search (const char *arc + 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)) |