* configure.in: Also handle --enable-64-bit-bfd when setting
	CORE_HEADER for 'i[3-7]86-*-linux-*'.
+2012-10-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * configure.in: Also handle --enable-64-bit-bfd when setting
+       CORE_HEADER for 'i[3-7]86-*-linux-*'.
+
 2012-10-30  Steve McIntyre  <steve.mcintyre@linaro.org>
 
        * elf32-arm.c (elf32_arm_print_private_bfd_data): Recognise and
 
   i[3-7]86-*-linux-*)
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/i386linux.h"'
-       case "$enable_targets" in
-       *x86_64-*linux*)
+       case "$enable_targets"-"$want64" in
+       *x86_64-*linux*|*-true)
          CORE_HEADER='"hosts/x86-64linux.h"'
        esac
        ;;
 
 changequote([,])dnl
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/i386linux.h"'
-       case "$enable_targets" in
-       *x86_64-*linux*)
+       case "$enable_targets"-"$want64" in
+       *x86_64-*linux*|*-true)
          CORE_HEADER='"hosts/x86-64linux.h"'
        esac
        ;;