diff options
author | 2022-02-14 08:11:42 (GMT) | |
---|---|---|
committer | 2022-02-14 08:11:42 (GMT) | |
commit | 681aaef1f1ff39c341fdc529e0db2c14639a58d8 (patch) | |
tree | ce98c2b3d9648db065d27add325370392a35d584 /packages/binutils/2.37/0006-sysroot.patch | |
parent | ba680a3e5b8c62a7c1554e71f6d09903dac95a2f (diff) | |
parent | 86c2982568de1ad4d4cc12a65b19231331484405 (diff) |
Merge pull request #1674 from stilor/master
Updates to make `ct-ng build-all` pass
Diffstat (limited to 'packages/binutils/2.37/0006-sysroot.patch')
-rw-r--r-- | packages/binutils/2.37/0006-sysroot.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/packages/binutils/2.37/0006-sysroot.patch b/packages/binutils/2.37/0006-sysroot.patch new file mode 100644 index 0000000..3b3c0ec --- /dev/null +++ b/packages/binutils/2.37/0006-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 @@ + 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)) |