patches/binutils/2.20.1a/130-ld-sysroot.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Dec 31 18:47:37 2011 +0100 (2011-12-31)
changeset 2829 0c3c95f911ec
parent 2088 4f21ba5f8e91
permissions -rw-r--r--
docs: credit Konrad EISELE for the initial multilib support

Konrad submitted an initial patch adding multlib support:
http://sourceware.org/ml/crossgcc/2011-11/msg00040.html

The patch was full of good ideas, but had a few issues, so
I (Yann E. MORIN) started it all from scatch, re-using part
of the original patch. This got implemented in this series:
hg log -r 446a17b5dd1e:e47d17391ae3

As I forgot to credit Konrad in these changelogs, update the
docs so that the work by Konrad gets credited. Without his
initial effort, we would probably not have had multlib support
so soon. Thank you Konrad!

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
     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 diff -durN binutils-2.20.1.orig/ld/ldfile.c binutils-2.20.1/ld/ldfile.c
     9 --- binutils-2.20.1.orig/ld/ldfile.c	2009-08-30 00:11:01.000000000 +0200
    10 +++ binutils-2.20.1/ld/ldfile.c	2010-08-17 19:32:08.000000000 +0200
    11 @@ -308,18 +308,24 @@
    12       directory first.  */
    13    if (! entry->is_archive)
    14      {
    15 -      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
    16 +      /* For absolute pathnames, try to always open the file in the
    17 +	 sysroot first. If this fails, try to open the file at the
    18 +	 given location. */
    19 +      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
    20 +      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
    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->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  	{
    36  	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
    37  	    && is_sysrooted_pathname (entry->filename, TRUE);