* configure.tgt (i[3-7]86-*-linux-*): Also define

	targ_extra_libpath in want64 case.
	* emulparams/elf_x86_64.sh: Handle i[3-7]86-*-linux-* the same as
	x86_64*-linux*.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e4ffb01622859e3fc54c0778cc1c722ddc39c8b0..674051eaa1290e25642c56fc888240f30464d0d2 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-18  Joseph Myers  <joseph@codesourcery.com>
+
+       * configure.tgt (i[3-7]86-*-linux-*): Also define
+       targ_extra_libpath in want64 case.
+       * emulparams/elf_x86_64.sh: Handle i[3-7]86-*-linux-* the same as
+       x86_64*-linux*.
+
 2006-10-17  Alan Modra  <amodra@bigpond.net.au>
 
        * scripttempl/elf.sc (INTERP): Delete.  Move definition to..

diff --git a/ld/configure.tgt b/ld/configure.tgt
index c5f3be3ab939a6990fca4a59848e7c3c3e0825d1..5dfec86dcb4957486a0ccc4aa54c328c35753aad 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -153,6 +153,7 @@ i[3-7]86-*-linux-*) targ_emul=elf_i386
                        targ_extra_emuls=i386linux
                        if test x${want64} = xtrue; then
                          targ_extra_emuls="$targ_extra_emuls elf_x86_64"
+                         targ_extra_libpath=elf_x86_64
                        fi
                        tdir_i386linux=${targ_alias}aout ;;
 x86_64-*-linux-*)      targ_emul=elf_x86_64

diff --git a/ld/emulparams/elf_x86_64.sh b/ld/emulparams/elf_x86_64.sh
index 3ed02039b3a0aa11d21fa5cc7e6d362d9ca545ab..449ccc90bd8d0f24ad53be99daa53b58210eb506 100644 (file)
--- a/ld/emulparams/elf_x86_64.sh
+++ b/ld/emulparams/elf_x86_64.sh
@@ -25,7 +25,7 @@ fi
 # Linux/Solaris modify the default library search path to first include
 # a 64-bit specific directory.
 case "$target" in
-  x86_64*-linux*)
+  x86_64*-linux*|i[3-7]86-*-linux-*)
     case "$EMULATION_NAME" in
       *64*) LIBPATH_SUFFIX=64 ;;
     esac