package/binutils/2.26.1/0500-add-sysroot-fix-from-bug-3049.patch

   1 From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001
   2 From: Romain Naour <romain.naour@gmail.com>
   3 Date: Fri, 25 Dec 2015 11:42:48 +0100
   4 Subject: [PATCH] add sysroot fix from bug #3049
   5
   6 Always try to prepend the sysroot prefix to absolute filenames first.
   7
   8 http://bugs.gentoo.org/275666
   9 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
  10
  11 Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
  12 [Romain: rebase on top of 2.26]
  13 Signed-off-by: Romain Naour <romain.naour@gmail.com>
  14 ---
  15  ld/ldfile.c | 11 +++++++++--
  16  1 file changed, 9 insertions(+), 2 deletions(-)
  17
  18 diff --git a/ld/ldfile.c b/ld/ldfile.c
  19 index 96f9ecc..1439309 100644
  20 --- a/ld/ldfile.c
  21 +++ b/ld/ldfile.c
  22 @@ -335,18 +335,25 @@ ldfile_open_file_search (const char *arch,
  23       directory first.  */
  24    if (! entry->flags.maybe_archive)
  25      {
  26 -      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
  27 +      /* For absolute pathnames, try to always open the file in the
  28 +        sysroot first. If this fails, try to open the file at the
  29 +        given location.  */
  30 +      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
  31 +      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
  32 +         && ld_sysroot)
  33         {
  34           char *name = concat (ld_sysroot, entry->filename,
  35                                (const char *) NULL);
  36           if (ldfile_try_open_bfd (name, entry))
  37             {
  38               entry->filename = name;
  39 +             entry->flags.sysrooted = TRUE;
  40               return TRUE;
  41             }
  42           free (name);
  43         }
  44 -      else if (ldfile_try_open_bfd (entry->filename, entry))
  45 +
  46 +      if (ldfile_try_open_bfd (entry->filename, entry))
  47         return TRUE;
  48
  49        if (IS_ABSOLUTE_PATH (entry->filename))
  50 --
  51 2.4.3
  52