i386: Don't add elf32_x86_64 to supported emulations

For 32-bit BFD, since elf64-x86-64.o isn't compiled in, "-m elf32_x86_64"
never worked.  Don't add elf32_x86_64 to supported emulations with 32-bit
BFD.

	* configure.tgt (i[3-7]86-*-linux-*): Move elf32_x86_64 from
	targ_extra_libpath to targ64_extra_libpath.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 24b6fa4d378cae54b0441b87c56c7ae626279d8a..ac96579e44263b4e22d99b729d3c2b1205d27166 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * configure.tgt (i[3-7]86-*-linux-*): Move elf32_x86_64 from
+       targ_extra_libpath to targ64_extra_libpath.
+
 2017-10-23  Nick Clifton  <nickc@redhat.com>
 
        PR 22310

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 42613e8f4f10682400db1b996a48467be170a51b..89f7bbfcbe0afec3c690966811df04e3588a8d55 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -269,8 +269,7 @@ i[3-7]86-*-linux*oldld)     targ_emul=i386linux
 i[3-7]86-*-linux-*)    targ_emul=elf_i386
                        targ_extra_emuls="i386linux elf_iamcu"
                        targ64_extra_emuls="elf_x86_64 elf32_x86_64 elf_l1om elf_k1om"
-                       targ64_extra_libpath=elf_x86_64
-                       targ_extra_libpath=elf32_x86_64
+                       targ64_extra_libpath="elf_x86_64 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 elf_iamcu i386linux elf_l1om elf_k1om"