Enable elf_k1om for x86_64-*-linux-gnux32

	* configure.tgt: Enable elf_k1om for x86_64-*-linux-gnux32.
	Remove x32 in tdir_i386linux and tdir_elf_i386.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 91a4211b8931b275373672c30712b13c67f74cc9..58b6beb249ceb620d04116ee386ed844786253ec 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * configure.tgt: Enable elf_k1om for x86_64-*-linux-gnux32.
+       Remove x32 in tdir_i386linux and tdir_elf_i386.
+
 2012-06-22  Roland McGrath  <mcgrathr@google.com>
 
        * NEWS: Mention __ehdr_start.

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 4171d8c9923f8efbc5a70af1c1c32a6746084c1f..d69ce6fa17a72d413db3a0b5517994cb598b94fc 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -205,10 +205,10 @@ i[3-7]86-*-linux-*)       targ_emul=elf_i386
                        targ_extra_libpath=elf32_x86_64
                        tdir_i386linux=${targ_alias}aout ;;
 x86_64-*-linux-gnux32) targ_emul=elf32_x86_64
-                       targ_extra_emuls="elf_x86_64 elf_i386 i386linux elf_l1om"
-                       targ_extra_libpath="elf_i386 elf_x86_64 elf_l1om"
-                       tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'`
-                       tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
+                       targ_extra_emuls="elf_x86_64 elf_i386 i386linux elf_l1om elf_k1om"
+                       targ_extra_libpath="elf_i386 elf_x86_64 elf_l1om elf_k1om"
+                       tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/' -e 's/x32//'`
+                       tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/x32//'` ;;
 x86_64-*-linux-*)      targ_emul=elf_x86_64
                        targ_extra_emuls="elf32_x86_64 elf_i386 i386linux elf_l1om elf_k1om"
                        targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om"