bfd:

* config.bfd (x86_64-*-netbsd*): New target.
	* configure.in (x86_64-*-netbsd*): Set COREFILE
	to netbsd-core.lo.
	* configure: Regenerated.

gas:
	* configure.in (i386-*-netbsdelf*): Collapse target into...
	(i386-*-netbsd*): ...this.  Add support for x86-64.
	* configure: Regenerated.

ld:
	* configure.tgt (x86_64-*-netbsd*): New target.

bfd/ChangeLog

@@ -1,3 +1,10 @@
+2002-01-04  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.bfd (x86_64-*-netbsd*): New target.
+	* configure.in (x86_64-*-netbsd*): Set COREFILE
+	to netbsd-core.lo.
+	* configure: Regenerated.
+
 2002-01-03  Tom Rix  <trix@redhat.com>
 
 	* xcofflink.c (_bfd_xcoff_bfd_final_link): Update .pad section ordering

bfd/config.bfd

@@ -398,6 +398,10 @@ case "${targ}" in
     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"

bfd/configure.in

@@ -356,6 +356,7 @@ changequote([,])dnl
 	COREFILE=trad-core.lo
 	TRAD_HEADER='"hosts/vaxbsd.h"'
 	;;
+  x86_64-*-netbsd*)	COREFILE=netbsd-core.lo ;;
   esac
 
   case "$COREFILE" in

gas/ChangeLog

@@ -1,3 +1,9 @@
+2002-01-04  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* configure.in (i386-*-netbsdelf*): Collapse target into...
+	(i386-*-netbsd*): ...this.  Add support for x86-64.
+	* configure: Regenerated.
+
 2002-01-03  matthew green  <mrg@redhat.com>
 
 	* config/tc-ppc.c (md_parse_option): BookE is not Motorola specific.

gas/configure.in

@@ -246,8 +246,16 @@ changequote([,])dnl
       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-*-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 ;;

ld/ChangeLog

@@ -1,3 +1,7 @@
+2002-01-04  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* configure.tgt (x86_64-*-netbsd*): New target.
+
 2001-12-21  Tom Rix  <trix@redhat.com>
 
 	(gld*_create_output_section_statements): New function.

ld/configure.tgt

@@ -159,6 +159,18 @@ i[3456]86-*-netbsdelf*)	targ_emul=elf_i386
 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])