mirror of
https://git.yoctoproject.org/poky
synced 2026-02-10 02:33:02 +01:00
94cc386236
And rebase the patches to the newer source code This patch is upstream hence deleting it from the recipe. binutils/110-arm-eabi-conf.patch (From OE-Core rev: 715bcfe3701e5ee3e12ee4af9c868a9bbf441525) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
Upstream-Status: Pending
|
|
|
|
http://sourceware.org/bugzilla/show_bug.cgi?id=10340
|
|
|
|
Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
|
|
|
|
Always try to prepend the sysroot prefix to absolute filenames first.
|
|
|
|
Index: binutils-2.22/ld/ldfile.c
|
|
===================================================================
|
|
--- binutils-2.22.orig/ld/ldfile.c
|
|
+++ binutils-2.22/ld/ldfile.c
|
|
@@ -351,18 +351,24 @@ ldfile_open_file_search (const char *arc
|
|
directory first. */
|
|
if (! entry->maybe_archive)
|
|
{
|
|
- if (entry->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->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
|
|
+ if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
|
|
{
|
|
char *name = concat (ld_sysroot, entry->filename,
|
|
(const char *) NULL);
|
|
if (ldfile_try_open_bfd (name, entry))
|
|
{
|
|
entry->filename = name;
|
|
+ entry->sysrooted = TRUE;
|
|
return TRUE;
|
|
}
|
|
free (name);
|
|
}
|
|
- else if (ldfile_try_open_bfd (entry->filename, entry))
|
|
+
|
|
+ if (ldfile_try_open_bfd (entry->filename, entry))
|
|
{
|
|
entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
|
|
&& is_sysrooted_pathname (entry->filename, TRUE);
|