yann@1614: Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
yann@1614: 
yann@1614: Always try to prepend the sysroot prefix to absolute filenames first.
yann@1614: 
yann@1614: http://bugs.gentoo.org/275666
yann@1614: http://sourceware.org/bugzilla/show_bug.cgi?id=10340
yann@1614: 
yann@2088: diff -durN binutils-2.20.1.orig/ld/ldfile.c binutils-2.20.1/ld/ldfile.c
yann@2088: --- binutils-2.20.1.orig/ld/ldfile.c	2009-08-30 00:11:01.000000000 +0200
yann@2088: +++ binutils-2.20.1/ld/ldfile.c	2010-08-17 19:32:08.000000000 +0200
yann@1614: @@ -308,18 +308,24 @@
yann@1614:       directory first.  */
yann@1614:    if (! entry->is_archive)
yann@1614:      {
yann@1614: -      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
yann@1614: +      /* For absolute pathnames, try to always open the file in the
yann@1614: +	 sysroot first. If this fails, try to open the file at the
yann@1614: +	 given location. */
yann@1614: +      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
yann@1614: +      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
yann@1614:  	{
yann@1614:  	  char *name = concat (ld_sysroot, entry->filename,
yann@1614:  			       (const char *) NULL);
yann@1614:  	  if (ldfile_try_open_bfd (name, entry))
yann@1614:  	    {
yann@1614:  	      entry->filename = name;
yann@1614: +	      entry->sysrooted = TRUE;
yann@1614:  	      return TRUE;
yann@1614:  	    }
yann@1614:  	  free (name);
yann@1614:  	}
yann@1614: -      else if (ldfile_try_open_bfd (entry->filename, entry))
yann@1614: +
yann@1614: +      if (ldfile_try_open_bfd (entry->filename, entry))
yann@1614:  	{
yann@1614:  	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
yann@1614:  	    && is_sysrooted_pathname (entry->filename, TRUE);