* 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*.

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..

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

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