package/binutils/2.25.1/500-sysroot.patch

   1 Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
   2
   3 Always try to prepend the sysroot prefix to absolute filenames first.
   4
   5 http://bugs.gentoo.org/275666
   6 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
   7
   8 --- a/ld/ldfile.c
   9 +++ b/ld/ldfile.c
  10 @@ -308,18 +308,25 @@
  11       directory first.  */
  12    if (! entry->flags.maybe_archive)
  13      {
  14 -      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
  15 +      /* For absolute pathnames, try to always open the file in the
  16 +        sysroot first. If this fails, try to open the file at the
  17 +        given location.  */
  18 +      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
  19 +      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
  20 +         && ld_sysroot)
  21         {
  22           char *name = concat (ld_sysroot, entry->filename,
  23                                (const char *) NULL);
  24           if (ldfile_try_open_bfd (name, entry))
  25             {
  26               entry->filename = name;
  27 +             entry->flags.sysrooted = TRUE;
  28               return TRUE;
  29             }
  30           free (name);
  31         }
  32 -      else if (ldfile_try_open_bfd (entry->filename, entry))
  33 +
  34 +      if (ldfile_try_open_bfd (entry->filename, entry))
  35         return TRUE;
  36
  37        if (IS_ABSOLUTE_PATH (entry->filename))