$NetBSD: patch-config,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $

Adjust config procedure.

--- config.orig	Mon Mar 17 16:14:20 2014
+++ config
@@ -49,6 +49,7 @@ done
 # First get uname entries that we use below
 
 [ "$MACHINE" ] || MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
+[ "$MACHINE_ARCH" ] || MACHINE_ARCH=`(uname -p) 2>/dev/null` || MACHINE_ARCH="unknown"
 [ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
 [ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"
 [ "$BUILD" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
@@ -162,6 +163,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	echo "mips4-sgi-irix64"; exit 0
 	;;
 
+    Interix:*)
+	echo "i386-pc-interix"; exit 0
+	;;
+
     Linux:[2-9].*)
 	echo "${MACHINE}-whatever-linux2"; exit 0
 	;;
@@ -170,6 +175,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	echo "${MACHINE}-whatever-linux1"; exit 0
 	;;
 
+    GNU/kFreeBSD:*)
+	echo "${MACHINE}-whatever-gnukfreebsd"; exit 0
+	;;
+
     GNU*)
 	echo "hurd-x86"; exit 0;
 	;;
@@ -218,15 +227,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	echo "${MACHINE}-whatever-freebsd"; exit 0
 	;;
 
-    NetBSD:*:*:*386*)
-        echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
+    DragonFly:*)
+	echo "${MACHINE}-whatever-dragonfly"; exit 0
 	;;
 
     NetBSD:*)
-	echo "${MACHINE}-whatever-netbsd"; exit 0
+	echo "${MACHINE_ARCH}-whatever-netbsd"; exit 0
 	;;
 
-    OpenBSD:*)
+    OpenBSD:*|MirBSD:*)
 	echo "${MACHINE}-whatever-openbsd"; exit 0
 	;;
 
@@ -728,12 +737,19 @@ case "$GUESSOS" in
 	;;
   *-*-sunos4)		OUT="sunos-$CC" ;;
 
+  alpha-*-netbsd|arm-*-netbsd|arm32-*-netbsd|m68000-*-netbsd|m68k-*-netbsd|\
+  mipseb-*-netbsd|mipsel-*-netbsd|ns32k-*-netbsd|powerpc-*-netbsd|\
+  sparc-*-netbsd|sparc64-*-netbsd|vax-*-netbsd|x86_64-*-netbsd)
+			OUT="NetBSD-${MACHINE_ARCH}" ;;
+
   *86*-*-bsdi4)		OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
   alpha*-*-*bsd*)	OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
   powerpc64-*-*bsd*)	OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;;
   sparc64-*-*bsd*)	OUT="BSD-sparc64" ;;
   ia64-*-*bsd*)		OUT="BSD-ia64" ;;
   amd64-*-*bsd*)	OUT="BSD-x86_64" ;;
+  i386-*-dragonfly*|x86_64-*-dragonfly*)	OUT="DragonFly-${MACHINE_ARCH}";;
+  i386-*-gnukfreebsd*|x86_64-*-gnukfreebsd*)	OUT="GNU/kFreeBSD-${MACHINE}";;
   *86*-*-*bsd*)		# mimic ld behaviour when it's looking for libc...
 			if [ -L /usr/lib/libc.so ]; then	# [Free|Net]BSD
 			    libc=/usr/lib/libc.so
@@ -746,6 +762,8 @@ case "$GUESSOS" in
 			*)	OUT="BSD-x86"; options="$options no-sse2" ;;
 			esac ;;
   *-*-*bsd*)		OUT="BSD-generic32" ;;
+
+  *-*-interix)		OUT="Interix" ;;
 
   *-*-osf)		OUT="osf1-alpha-cc" ;;
   *-*-tru64)		OUT="tru64-alpha-cc" ;;