Index: bfd/config.bfd
===================================================================
RCS file: /cvs/src/src/bfd/config.bfd,v
retrieving revision 1.78
diff -c -r1.78 config.bfd
*** config.bfd	2001/12/20 05:38:52	1.78
--- config.bfd	2001/12/29 20:16:51
***************
*** 398,403 ****
--- 398,407 ----
      targ_defvec=bfd_elf64_x86_64_vec
      targ_selvecs="bfd_elf32_i386_vec i386coff_vec bfd_efi_app_ia32_vec"
      ;;
+   x86_64-*-netbsd*)
+     targ_defvec=bfd_elf64_x86_64_vec
+     targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec"
+     ;;
    x86_64-*-linux-gnu*)
      targ_defvec=bfd_elf64_x86_64_vec
      targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
Index: bfd/configure.in
===================================================================
RCS file: /cvs/src/src/bfd/configure.in,v
retrieving revision 1.75
diff -c -r1.75 configure.in
*** configure.in	2001/12/20 03:18:23	1.75
--- configure.in	2001/12/29 20:17:09
***************
*** 356,361 ****
--- 356,362 ----
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/vaxbsd.h"'
  	;;
+   x86_64-*-netbsd*)	COREFILE=netbsd-core.lo ;;
    esac
  
    case "$COREFILE" in
Index: gas/configure.in
===================================================================
RCS file: /cvs/src/src/gas/configure.in,v
retrieving revision 1.89
diff -c -r1.89 configure.in
*** configure.in	2001/12/20 05:39:36	1.89
--- configure.in	2001/12/29 20:17:25
***************
*** 246,253 ****
        i386-*-beoself* | i386-*-beos*) fmt=elf bfd_gas=yes ;;
        i386-*-bsd*)          fmt=aout em=386bsd ;;
        i386-*-netbsd0.8)     fmt=aout em=386bsd ;;
!       i386-*-netbsdelf*)    fmt=elf em=nbsd bfd_gas=yes ;;
!       i386-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes;;
        i386-*-openbsd*)      fmt=aout em=nbsd bfd_gas=yes;;
        i386-*-linux*aout* | i386-*-linux*oldld)   fmt=aout em=linux ;;
        i386-*-linux*coff*)   fmt=coff em=linux ;;
--- 246,261 ----
        i386-*-beoself* | i386-*-beos*) fmt=elf bfd_gas=yes ;;
        i386-*-bsd*)          fmt=aout em=386bsd ;;
        i386-*-netbsd0.8)     fmt=aout em=386bsd ;;
!       i386-*-netbsd*)       em=nbsd bfd_gas=yes
! 			    case ${cpu} in
! 			      x86_64)	fmt=elf ;;
! 			      *)	case ${os} in
! 					  *elf*) fmt=elf ;;
! 					  *)     fmt=aout ;;
! 					esac
! 					;;
! 			    esac
! 			    ;;
        i386-*-openbsd*)      fmt=aout em=nbsd bfd_gas=yes;;
        i386-*-linux*aout* | i386-*-linux*oldld)   fmt=aout em=linux ;;
        i386-*-linux*coff*)   fmt=coff em=linux ;;
Index: ld/configure.tgt
===================================================================
RCS file: /cvs/src/src/ld/configure.tgt,v
retrieving revision 1.74
diff -c -r1.74 configure.tgt
*** configure.tgt	2001/12/20 05:40:08	1.74
--- configure.tgt	2001/12/29 20:17:31
***************
*** 159,164 ****
--- 159,176 ----
  i[3456]86-*-netbsd*)	targ_emul=i386nbsd
  			targ_extra_emuls=elf_i386
  			;;
+ x86_64-*-netbsd*)	targ_emul=elf_x86_64
+ 			targ_extra_emuls="elf_i386 i386nbsd"
+ 			tdir_elf_i386=`echo ${targ_alias} | \
+ 			    sed -e 's/x86_64/i386/'`
+ 			case "${tdir_elf_i386}" in
+ 			*-netbsdelf*) ;;
+ 			*)
+ 				tdir_elf_i386=`echo ${tdir_elf_i386} | \
+ 				    sed -e 's/netbsd/netbsdelf/'`
+ 				;;
+ 			esac
+ 			;;
  i[3456]86-*-netware)	targ_emul=i386nw ;;
  i[3456]86-*-elf*)	targ_emul=elf_i386 ;;
  i[3456]86-*-freebsdaout* | i[3456]86-*-freebsd[12].* | i[3456]86-*-freebsd[12])