diff --git a/gnu/dist/toolchain/gas/configure b/gnu/dist/toolchain/gas/configure
index c09f1985b1d9..75ffaedb6650 100755
--- a/gnu/dist/toolchain/gas/configure
+++ b/gnu/dist/toolchain/gas/configure
@@ -1714,8 +1714,8 @@ for this_target in $target $canon_targets ; do
       i386-*-beoself* | i386-*-beos*) fmt=elf bfd_gas=yes ;;
       i386-*-bsd*)          fmt=aout em=386bsd ;;
       i386-*-netbsd0.8)     fmt=aout em=386bsd ;;
-      i386-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes;;
-      i386-*-openbsd*)      fmt=aout em=nbsd bfd_gas=yes;;
+      i386-*-netbsd*elf*)   fmt=elf em=nbsd bfd_gas=yes ;;
+      i386-*-netbsd* | i386-*-openbsd*) fmt=aout em=nbsd bfd_gas=yes ;;
       i386-*-linux*aout* | i386-*-linuxoldld)   fmt=aout em=linux ;;
       i386-*-linux*coff*)   fmt=coff em=linux ;;
       i386-*-linux-gnu*)    fmt=elf em=linux bfd_gas=yes ;;
@@ -1785,8 +1785,8 @@ EOF
       m68k-*-linux-gnu*)    fmt=elf em=linux ;;
       m68k-*-gnu*)	    fmt=elf ;;
       m68k-*-lynxos*)       fmt=coff em=lynx ;;
-      m68k-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes ;;
-      m68k-*-openbsd*)      fmt=aout em=nbsd bfd_gas=yes ;;
+      m68k-*-netbsd*elf*)   fmt=elf em=nbsd bfd_gas=yes ;;
+      m68k-*-netbsd* | m68k-*-openbsd*) fmt=aout em=nbsd bfd_gas=yes ;;
       m68k-apple-aux*)      fmt=coff em=aux ;;
       m68k-*-psos*)         fmt=elf em=psos;;
 
@@ -1797,7 +1797,8 @@ EOF
       mcore-*-pe)	    fmt=coff em=pe bfd_gas=yes ;;
 
       # don't change em like *-*-bsd does
-      mips-dec-netbsd*)	    fmt=elf endian=little ;;
+      mipseb-*-netbsd*)	    fmt=elf endian=big ;;
+      mipsel-*-netbsd*)	    fmt=elf endian=little ;;
       mips-dec-openbsd*)    fmt=elf endian=little ;;
       mips-dec-bsd*)        fmt=aout endian=little ;;
       mips-sony-bsd*)       fmt=ecoff ;;
@@ -1877,15 +1878,12 @@ EOF
       sparc-fujitsu-none)   fmt=aout ;;
       sparc-*-elf | sparc-*-sysv4* | sparc-*-solaris*)
 			    fmt=elf ;;
-      sparc-*-netbsd*)      em=nbsd bfd_gas=yes
-                            case ${cpu} in
-                                sparc) case ${os} in
-                                           *elf*) fmt=elf ;;
-                                           *)     fmt=aout ;;
-                                       esac ;;
-                                sparc64) fmt=elf ;;
+      sparc-*-netbsd*elf*)  fmt=elf em=nbsd bfd_gas=yes ;;
+      sparc-*-netbsd*)      case ${cpu} in
+                            sparc) fmt=aout ;;
+                            sparc64) fmt=elf ;;
                             esac
-                            ;;
+                            em=nbsd bfd_gas=yes ;;
       sparc-*-openbsd*)     fmt=aout em=nbsd ;;
 
       strongarm-*-coff)     fmt=coff ;;
@@ -1899,7 +1897,7 @@ EOF
       v850e-*-*)	    fmt=elf bfd_gas=yes ;;
       v850ea-*-*)	    fmt=elf bfd_gas=yes ;;
 
-      vax-*-bsd* | vax-*-ultrix*)
+      vax-*-netbsd | vax-*-bsd* | vax-*-ultrix*)
 			    fmt=aout ;;
       vax-*-vms)            fmt=vms ;;
 
diff --git a/gnu/dist/toolchain/gas/configure.in b/gnu/dist/toolchain/gas/configure.in
index f110f44f09de..547df8b0a42e 100644
--- a/gnu/dist/toolchain/gas/configure.in
+++ b/gnu/dist/toolchain/gas/configure.in
@@ -192,8 +192,8 @@ 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-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes;;
-      i386-*-openbsd*)      fmt=aout em=nbsd bfd_gas=yes;;
+      i386-*-netbsd*elf*)   fmt=elf em=nbsd bfd_gas=yes ;;
+      i386-*-netbsd* | i386-*-openbsd*) fmt=aout em=nbsd bfd_gas=yes ;;
       i386-*-linux*aout* | i386-*-linuxoldld)   fmt=aout em=linux ;;
       i386-*-linux*coff*)   fmt=coff em=linux ;;
       i386-*-linux-gnu*)    fmt=elf em=linux bfd_gas=yes ;;
@@ -263,8 +263,8 @@ changequote([,])dnl
       m68k-*-linux-gnu*)    fmt=elf em=linux ;;
       m68k-*-gnu*)	    fmt=elf ;;
       m68k-*-lynxos*)       fmt=coff em=lynx ;;
-      m68k-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes ;;
-      m68k-*-openbsd*)      fmt=aout em=nbsd bfd_gas=yes ;;
+      m68k-*-netbsd*elf*)   fmt=elf em=nbsd bfd_gas=yes ;;
+      m68k-*-netbsd* | m68k-*-openbsd*) fmt=aout em=nbsd bfd_gas=yes ;;
       m68k-apple-aux*)      fmt=coff em=aux ;;
       m68k-*-psos*)         fmt=elf em=psos;;
 
@@ -275,7 +275,8 @@ changequote([,])dnl
       mcore-*-pe)	    fmt=coff em=pe bfd_gas=yes ;;
 
       # don't change em like *-*-bsd does
-      mips-dec-netbsd*)	    fmt=elf endian=little ;;
+      mipseb-*-netbsd*)	    fmt=elf endian=big ;;
+      mipsel-*-netbsd*)	    fmt=elf endian=little ;;
       mips-dec-openbsd*)    fmt=elf endian=little ;;
       mips-dec-bsd*)        fmt=aout endian=little ;;
       mips-sony-bsd*)       fmt=ecoff ;;
@@ -351,15 +352,12 @@ changequote([,])dnl
       sparc-fujitsu-none)   fmt=aout ;;
       sparc-*-elf | sparc-*-sysv4* | sparc-*-solaris*)
 			    fmt=elf ;;
-      sparc-*-netbsd*)      em=nbsd bfd_gas=yes
-                            case ${cpu} in
-                                sparc) case ${os} in
-                                           *elf*) fmt=elf ;;
-                                           *)     fmt=aout ;;
-                                       esac ;;
-                                sparc64) fmt=elf ;;
+      sparc-*-netbsd*elf*)  fmt=elf em=nbsd bfd_gas=yes ;;
+      sparc-*-netbsd*)      case ${cpu} in
+                            sparc) fmt=aout ;;
+                            sparc64) fmt=elf ;;
                             esac
-                            ;;
+                            em=nbsd bfd_gas=yes ;;
       sparc-*-openbsd*)     fmt=aout em=nbsd ;;
 
       strongarm-*-coff)     fmt=coff ;;
@@ -373,7 +371,7 @@ changequote([,])dnl
       v850e-*-*)	    fmt=elf bfd_gas=yes ;;
       v850ea-*-*)	    fmt=elf bfd_gas=yes ;;
 
-      vax-*-bsd* | vax-*-ultrix*)
+      vax-*-netbsd | vax-*-bsd* | vax-*-ultrix*)
 			    fmt=aout ;;
       vax-*-vms)            fmt=vms ;;