Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>

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

diff -durN binutils-2.20.1.orig/ld/ldfile.c binutils-2.20.1/ld/ldfile.c

--- binutils-2.20.1.orig/ld/ldfile.c	2009-08-30 00:11:01.000000000 +0200

+++ binutils-2.20.1/ld/ldfile.c	2010-08-17 19:32:08.000000000 +0200

@@ -308,18 +308,24 @@

      directory first.  */

   if (! entry->is_archive)

     {

-      if (entry->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->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);

+      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)

 	{

 	  char *name = concat (ld_sysroot, entry->filename,

 			       (const char *) NULL);

 	  if (ldfile_try_open_bfd (name, entry))

 	    {

 	      entry->filename = name;

+	      entry->sysrooted = TRUE;

 	      return TRUE;

 	    }

 	  free (name);

 	}

-      else if (ldfile_try_open_bfd (entry->filename, entry))

+

+      if (ldfile_try_open_bfd (entry->filename, entry))

 	{

 	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)

 	    && is_sysrooted_pathname (entry->filename, TRUE);