From e008d409dcffed0a46ae4fb94c6975b3e60656cc Mon Sep 17 00:00:00 2001 From: Sven Rebhan Date: Mon, 8 Aug 2022 20:46:29 +1200 Subject: [PATCH] sysroot 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 Signed-off-by: Sven Rebhan --- ld/ldfile.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -340,18 +340,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))