ld:

	Backport from mainline:
	2011-11-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* configure.tgt (x86_64-*-solaris2*): Use $targ_extra_emuls for
	targ_extra_libpath.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 66b2b7302f9af39dd4f8c3a1c9bc920085d8b628..f5fa6ff530913dde2128857f06da5eb4ca673f0d 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       Backport from mainline:
+       2011-11-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * configure.tgt (x86_64-*-solaris2*): Use $targ_extra_emuls for
+       targ_extra_libpath.
+
 2011-10-25  Alan Modra  <amodra@gmail.com>
 
        Apply mainline patches

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 23cf34748c9ff49dca8f788503862a18352ea53a..197f27ac0004081dab953b944a7e92a5ac9cc08a 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -203,7 +203,7 @@ i[3-7]86-*-solaris2*)       targ_emul=elf_i386_sol2
 x86_64-*-solaris2*)
                        targ_emul=elf_x86_64_sol2
                        targ_extra_emuls="elf_x86_64 elf_i386_sol2 elf_i386_ldso elf_i386 elf_l1om elf_k1om"
-                       targ_extra_libpath=elf_i386
+                       targ_extra_libpath=$targ_extra_emuls
                        tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
 i[3-7]86-*-unixware)   targ_emul=elf_i386 ;;
 i[3-7]86-*-solaris*)   targ_emul=elf_i386_ldso