From a6df7ffb2d109177a97bf6e9da08028c17f2bcc7 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Fri, 15 Mar 2019 18:32:49 +0000 Subject: [PATCH] package/binutils: bring back sysroot fix for 2.38 Signed-off-by: Ben Cressey --- .../9001-add-sysroot-fix-from-bug-3049.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/binutils/2.38/9001-add-sysroot-fix-from-bug-3049.patch diff --git a/package/binutils/2.38/9001-add-sysroot-fix-from-bug-3049.patch b/package/binutils/2.38/9001-add-sysroot-fix-from-bug-3049.patch new file mode 100644 index 0000000000..7674fa3ad9 --- /dev/null +++ b/package/binutils/2.38/9001-add-sysroot-fix-from-bug-3049.patch @@ -0,0 +1,53 @@ +From dc372679aa22f0a5341891924ccfce1e64537fd6 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:42:48 +0100 +Subject: [PATCH] add sysroot fix from bug #3049 + +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 +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +[bcressey: rebase on top of 2.38] +Signed-off-by: Ben Cressey +--- + ld/ldfile.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 731ae5f7aed..7fda926c03c 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -340,18 +340,24 @@ ldfile_open_file_search (const char *arch, + 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)) +-- +2.36.1 + -- 2.37.2