Commit 6bcb6869 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

binutils: add sysroot fix from bug #3049 

Add binutils ld sysroot bug fix.
See http://sourceware.org/bugzilla/show_bug.cgi?id=10340



Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 0c5e24d4

package/binutils/binutils-2.20.1/500-sysroot.patch

0 → 100644
+36 −0
Original line number Diff line number Diff line 
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



--- a/ld/ldfile.c

+++ b/ld/ldfile.c

@@ -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);

package/binutils/binutils-2.20/500-sysroot.patch

0 → 100644
+36 −0
Original line number Diff line number Diff line 
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



--- a/ld/ldfile.c

+++ b/ld/ldfile.c

@@ -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);

package/binutils/binutils-2.21.1/500-sysroot.patch

0 → 100644
+36 −0
Original line number Diff line number Diff line 
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



--- a/ld/ldfile.c

+++ b/ld/ldfile.c

@@ -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);

package/binutils/binutils-2.21/500-sysroot.patch

0 → 100644
+36 −0
Original line number Diff line number Diff line 
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



--- a/ld/ldfile.c

+++ b/ld/ldfile.c

@@ -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);

package/binutils/binutils-2.22/500-sysroot.patch

0 → 100644
+36 −0
Original line number Diff line number Diff line 
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



--- a/ld/ldfile.c

+++ b/ld/ldfile.c

@@ -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);