Blame SOURCES/libdbi-aarch64.patch

20f812
diff -urN libdbi-0.8.4/config.guess libdbi-0.8.4-aarch64/config.guess
20f812
--- libdbi-0.8.4/config.guess	2010-03-13 03:42:24.000000000 -0600
20f812
+++ libdbi-0.8.4-aarch64/config.guess	2013-03-08 01:31:15.642438570 -0600
20f812
@@ -1,9 +1,10 @@
20f812
 #! /bin/sh
20f812
 # Attempt to guess a canonical system name.
20f812
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
20f812
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
20f812
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
20f812
+#   2011, 2012 Free Software Foundation, Inc.
20f812
 
20f812
-timestamp='2003-07-02'
20f812
+timestamp='2012-09-25'
20f812
 
20f812
 # This file is free software; you can redistribute it and/or modify it
20f812
 # under the terms of the GNU General Public License as published by
20f812
@@ -16,24 +17,24 @@
20f812
 # General Public License for more details.
20f812
 #
20f812
 # You should have received a copy of the GNU General Public License
20f812
-# along with this program; if not, write to the Free Software
20f812
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20f812
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
20f812
 #
20f812
 # As a special exception to the GNU General Public License, if you
20f812
 # distribute this file as part of a program that contains a
20f812
 # configuration script generated by Autoconf, you may include it under
20f812
 # the same distribution terms that you use for the rest of that program.
20f812
 
20f812
-# Originally written by Per Bothner <per@bothner.com>.
20f812
-# Please send patches to <config-patches@gnu.org>.  Submit a context
20f812
-# diff and a properly formatted ChangeLog entry.
20f812
+
20f812
+# Originally written by Per Bothner.  Please send patches (context
20f812
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
20f812
+# entry.
20f812
 #
20f812
 # This script attempts to guess a canonical system name similar to
20f812
 # config.sub.  If it succeeds, it prints the system name on stdout, and
20f812
 # exits with 0.  Otherwise, it exits with 1.
20f812
 #
20f812
-# The plan is that this can be called by configure scripts if you
20f812
-# don't specify an explicit build system type.
20f812
+# You can get the latest version of this script from:
20f812
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
20f812
 
20f812
 me=`echo "$0" | sed -e 's,.*/,,'`
20f812
 
20f812
@@ -53,7 +54,8 @@
20f812
 GNU config.guess ($timestamp)
20f812
 
20f812
 Originally written by Per Bothner.
20f812
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
20f812
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
20f812
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
20f812
 Free Software Foundation, Inc.
20f812
 
20f812
 This is free software; see the source for copying conditions.  There is NO
20f812
@@ -66,11 +68,11 @@
20f812
 while test $# -gt 0 ; do
20f812
   case $1 in
20f812
     --time-stamp | --time* | -t )
20f812
-       echo "$timestamp" ; exit 0 ;;
20f812
+       echo "$timestamp" ; exit ;;
20f812
     --version | -v )
20f812
-       echo "$version" ; exit 0 ;;
20f812
+       echo "$version" ; exit ;;
20f812
     --help | --h* | -h )
20f812
-       echo "$usage"; exit 0 ;;
20f812
+       echo "$usage"; exit ;;
20f812
     -- )     # Stop option processing
20f812
        shift; break ;;
20f812
     - )	# Use stdin as input.
20f812
@@ -104,7 +106,7 @@
20f812
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
20f812
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
20f812
 : ${TMPDIR=/tmp} ;
20f812
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
20f812
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
20f812
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
20f812
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
20f812
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
20f812
@@ -123,7 +125,7 @@
20f812
 	;;
20f812
  ,,*)   CC_FOR_BUILD=$CC ;;
20f812
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
20f812
-esac ;'
20f812
+esac ; set_cc_for_build= ;'
20f812
 
20f812
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
20f812
 # (ghazi@noc.rutgers.edu 1994-08-24)
20f812
@@ -141,7 +143,7 @@
20f812
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
20f812
     *:NetBSD:*:*)
20f812
 	# NetBSD (nbsd) targets should (where applicable) match one or
20f812
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
20f812
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
20f812
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
20f812
 	# switched to ELF, *-*-netbsd* would select the old
20f812
 	# object file format.  This provides both forward
20f812
@@ -158,6 +160,7 @@
20f812
 	    arm*) machine=arm-unknown ;;
20f812
 	    sh3el) machine=shl-unknown ;;
20f812
 	    sh3eb) machine=sh-unknown ;;
20f812
+	    sh5el) machine=sh5le-unknown ;;
20f812
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
20f812
 	esac
20f812
 	# The Operating System including object format, if it has switched
20f812
@@ -166,7 +169,7 @@
20f812
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
20f812
 		eval $set_cc_for_build
20f812
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
20f812
-			| grep __ELF__ >/dev/null
20f812
+			| grep -q __ELF__
20f812
 		then
20f812
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
20f812
 		    # Return netbsd for either.  FIX?
20f812
@@ -176,7 +179,7 @@
20f812
 		fi
20f812
 		;;
20f812
 	    *)
20f812
-	        os=netbsd
20f812
+		os=netbsd
20f812
 		;;
20f812
 	esac
20f812
 	# The OS release
20f812
@@ -196,50 +199,36 @@
20f812
 	# contains redundant information, the shorter form:
20f812
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
20f812
 	echo "${machine}-${os}${release}"
20f812
-	exit 0 ;;
20f812
-    amiga:OpenBSD:*:*)
20f812
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    arc:OpenBSD:*:*)
20f812
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    hp300:OpenBSD:*:*)
20f812
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    mac68k:OpenBSD:*:*)
20f812
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    macppc:OpenBSD:*:*)
20f812
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    mvme68k:OpenBSD:*:*)
20f812
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    mvme88k:OpenBSD:*:*)
20f812
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    mvmeppc:OpenBSD:*:*)
20f812
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    pmax:OpenBSD:*:*)
20f812
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    sgi:OpenBSD:*:*)
20f812
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    sun3:OpenBSD:*:*)
20f812
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    wgrisc:OpenBSD:*:*)
20f812
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    *:Bitrig:*:*)
20f812
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
20f812
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
20f812
+	exit ;;
20f812
     *:OpenBSD:*:*)
20f812
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
20f812
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
20f812
+	exit ;;
20f812
+    *:ekkoBSD:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
20f812
+	exit ;;
20f812
+    *:SolidBSD:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
20f812
+	exit ;;
20f812
+    macppc:MirBSD:*:*)
20f812
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
20f812
+	exit ;;
20f812
+    *:MirBSD:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
20f812
+	exit ;;
20f812
     alpha:OSF1:*:*)
20f812
-	if test $UNAME_RELEASE = "V4.0"; then
20f812
+	case $UNAME_RELEASE in
20f812
+	*4.0)
20f812
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
20f812
-	fi
20f812
+		;;
20f812
+	*5.*)
20f812
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
20f812
+		;;
20f812
+	esac
20f812
 	# According to Compaq, /usr/sbin/psrinfo has been available on
20f812
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
20f812
 	# covers most systems running today.  This code pipes the CPU
20f812
@@ -277,42 +266,52 @@
20f812
 	    "EV7.9 (21364A)")
20f812
 		UNAME_MACHINE="alphaev79" ;;
20f812
 	esac
20f812
+	# A Pn.n version is a patched version.
20f812
 	# A Vn.n version is a released version.
20f812
 	# A Tn.n version is a released field test version.
20f812
 	# A Xn.n version is an unreleased experimental baselevel.
20f812
 	# 1.2 uses "1.2" for uname -r.
20f812
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
20f812
-	exit 0 ;;
20f812
-    Alpha*:OpenVMS:*:*)
20f812
-	echo alpha-hp-vms
20f812
-	exit 0 ;;
20f812
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
20f812
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
20f812
+	exitcode=$?
20f812
+	trap '' 0
20f812
+	exit $exitcode ;;
20f812
     Alpha\ *:Windows_NT*:*)
20f812
 	# How do we know it's Interix rather than the generic POSIX subsystem?
20f812
 	# Should we change UNAME_MACHINE based on the output of uname instead
20f812
 	# of the specific Alpha model?
20f812
 	echo alpha-pc-interix
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     21064:Windows_NT:50:3)
20f812
 	echo alpha-dec-winnt3.5
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     Amiga*:UNIX_System_V:4.0:*)
20f812
 	echo m68k-unknown-sysv4
20f812
-	exit 0;;
20f812
+	exit ;;
20f812
     *:[Aa]miga[Oo][Ss]:*:*)
20f812
 	echo ${UNAME_MACHINE}-unknown-amigaos
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:[Mm]orph[Oo][Ss]:*:*)
20f812
 	echo ${UNAME_MACHINE}-unknown-morphos
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:OS/390:*:*)
20f812
 	echo i370-ibm-openedition
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    *:z/VM:*:*)
20f812
+	echo s390-ibm-zvmoe
20f812
+	exit ;;
20f812
+    *:OS400:*:*)
20f812
+	echo powerpc-ibm-os400
20f812
+	exit ;;
20f812
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
20f812
 	echo arm-acorn-riscix${UNAME_RELEASE}
20f812
-	exit 0;;
20f812
+	exit ;;
20f812
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
20f812
+	echo arm-unknown-riscos
20f812
+	exit ;;
20f812
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
20f812
 	echo hppa1.1-hitachi-hiuxmpp
20f812
-	exit 0;;
20f812
+	exit ;;
20f812
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
20f812
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
20f812
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
20f812
@@ -320,32 +319,51 @@
20f812
 	else
20f812
 		echo pyramid-pyramid-bsd
20f812
 	fi
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     NILE*:*:*:dcosx)
20f812
 	echo pyramid-pyramid-svr4
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     DRS?6000:unix:4.0:6*)
20f812
 	echo sparc-icl-nx6
20f812
-	exit 0 ;;
20f812
-    DRS?6000:UNIX_SV:4.2*:7*)
20f812
+	exit ;;
20f812
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
20f812
 	case `/usr/bin/uname -p` in
20f812
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
20f812
+	    sparc) echo sparc-icl-nx7; exit ;;
20f812
 	esac ;;
20f812
+    s390x:SunOS:*:*)
20f812
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
20f812
+	exit ;;
20f812
     sun4H:SunOS:5.*:*)
20f812
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
20f812
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
20f812
-	exit 0 ;;
20f812
-    i86pc:SunOS:5.*:*)
20f812
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
20f812
+	echo i386-pc-auroraux${UNAME_RELEASE}
20f812
+	exit ;;
20f812
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
20f812
+	eval $set_cc_for_build
20f812
+	SUN_ARCH="i386"
20f812
+	# If there is a compiler, see if it is configured for 64-bit objects.
20f812
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
20f812
+	# This test works for both compilers.
20f812
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
20f812
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
20f812
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
20f812
+		grep IS_64BIT_ARCH >/dev/null
20f812
+	    then
20f812
+		SUN_ARCH="x86_64"
20f812
+	    fi
20f812
+	fi
20f812
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
20f812
+	exit ;;
20f812
     sun4*:SunOS:6*:*)
20f812
 	# According to config.sub, this is the proper way to canonicalize
20f812
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
20f812
 	# it's likely to be more like Solaris than SunOS4.
20f812
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     sun4*:SunOS:*:*)
20f812
 	case "`/usr/bin/arch -k`" in
20f812
 	    Series*|S4*)
20f812
@@ -354,10 +372,10 @@
20f812
 	esac
20f812
 	# Japanese Language versions have a version number like `4.1.3-JL'.
20f812
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     sun3*:SunOS:*:*)
20f812
 	echo m68k-sun-sunos${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     sun*:*:4.2BSD:*)
20f812
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
20f812
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
20f812
@@ -369,10 +387,10 @@
20f812
 		echo sparc-sun-sunos${UNAME_RELEASE}
20f812
 		;;
20f812
 	esac
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     aushp:SunOS:*:*)
20f812
 	echo sparc-auspex-sunos${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     # The situation for MiNT is a little confusing.  The machine name
20f812
     # can be virtually everything (everything which is not
20f812
     # "atarist" or "atariste" at least should have a processor
20f812
@@ -382,38 +400,41 @@
20f812
     # MiNT.  But MiNT is downward compatible to TOS, so this should
20f812
     # be no problem.
20f812
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
20f812
-        echo m68k-atari-mint${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	echo m68k-atari-mint${UNAME_RELEASE}
20f812
+	exit ;;
20f812
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
20f812
 	echo m68k-atari-mint${UNAME_RELEASE}
20f812
-        exit 0 ;;
20f812
+	exit ;;
20f812
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
20f812
-        echo m68k-atari-mint${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	echo m68k-atari-mint${UNAME_RELEASE}
20f812
+	exit ;;
20f812
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
20f812
-        echo m68k-milan-mint${UNAME_RELEASE}
20f812
-        exit 0 ;;
20f812
+	echo m68k-milan-mint${UNAME_RELEASE}
20f812
+	exit ;;
20f812
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
20f812
-        echo m68k-hades-mint${UNAME_RELEASE}
20f812
-        exit 0 ;;
20f812
+	echo m68k-hades-mint${UNAME_RELEASE}
20f812
+	exit ;;
20f812
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
20f812
-        echo m68k-unknown-mint${UNAME_RELEASE}
20f812
-        exit 0 ;;
20f812
+	echo m68k-unknown-mint${UNAME_RELEASE}
20f812
+	exit ;;
20f812
+    m68k:machten:*:*)
20f812
+	echo m68k-apple-machten${UNAME_RELEASE}
20f812
+	exit ;;
20f812
     powerpc:machten:*:*)
20f812
 	echo powerpc-apple-machten${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     RISC*:Mach:*:*)
20f812
 	echo mips-dec-mach_bsd4.3
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     RISC*:ULTRIX:*:*)
20f812
 	echo mips-dec-ultrix${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     VAX*:ULTRIX*:*:*)
20f812
 	echo vax-dec-ultrix${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     2020:CLIX:*:* | 2430:CLIX:*:*)
20f812
 	echo clipper-intergraph-clix${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     mips:*:*:UMIPS | mips:*:*:RISCos)
20f812
 	eval $set_cc_for_build
20f812
 	sed 's/^	//' << EOF >$dummy.c
20f812
@@ -437,35 +458,36 @@
20f812
 	  exit (-1);
20f812
 	}
20f812
 EOF
20f812
-	$CC_FOR_BUILD -o $dummy $dummy.c \
20f812
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
20f812
-	  && exit 0
20f812
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
20f812
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
20f812
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
20f812
+	    { echo "$SYSTEM_NAME"; exit; }
20f812
 	echo mips-mips-riscos${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     Motorola:PowerMAX_OS:*:*)
20f812
 	echo powerpc-motorola-powermax
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     Motorola:*:4.3:PL8-*)
20f812
 	echo powerpc-harris-powermax
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
20f812
 	echo powerpc-harris-powermax
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     Night_Hawk:Power_UNIX:*:*)
20f812
 	echo powerpc-harris-powerunix
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     m88k:CX/UX:7*:*)
20f812
 	echo m88k-harris-cxux7
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     m88k:*:4*:R4*)
20f812
 	echo m88k-motorola-sysv4
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     m88k:*:3*:R3*)
20f812
 	echo m88k-motorola-sysv3
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     AViiON:dgux:*:*)
20f812
-        # DG/UX returns AViiON for all architectures
20f812
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
20f812
+	# DG/UX returns AViiON for all architectures
20f812
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
20f812
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
20f812
 	then
20f812
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
20f812
@@ -478,29 +500,29 @@
20f812
 	else
20f812
 	    echo i586-dg-dgux${UNAME_RELEASE}
20f812
 	fi
20f812
- 	exit 0 ;;
20f812
+	exit ;;
20f812
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
20f812
 	echo m88k-dolphin-sysv3
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     M88*:*:R3*:*)
20f812
 	# Delta 88k system running SVR3
20f812
 	echo m88k-motorola-sysv3
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
20f812
 	echo m88k-tektronix-sysv3
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
20f812
 	echo m68k-tektronix-bsd
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:IRIX*:*:*)
20f812
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
20f812
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
20f812
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
20f812
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
20f812
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
20f812
     i*86:AIX:*:*)
20f812
 	echo i386-ibm-aix
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     ia64:AIX:*:*)
20f812
 	if [ -x /usr/bin/oslevel ] ; then
20f812
 		IBM_REV=`/usr/bin/oslevel`
20f812
@@ -508,7 +530,7 @@
20f812
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
20f812
 	fi
20f812
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:AIX:2:3)
20f812
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
20f812
 		eval $set_cc_for_build
20f812
@@ -523,15 +545,19 @@
20f812
 			exit(0);
20f812
 			}
20f812
 EOF
20f812
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
20f812
-		echo rs6000-ibm-aix3.2.5
20f812
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
20f812
+		then
20f812
+			echo "$SYSTEM_NAME"
20f812
+		else
20f812
+			echo rs6000-ibm-aix3.2.5
20f812
+		fi
20f812
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
20f812
 		echo rs6000-ibm-aix3.2.4
20f812
 	else
20f812
 		echo rs6000-ibm-aix3.2
20f812
 	fi
20f812
-	exit 0 ;;
20f812
-    *:AIX:*:[45])
20f812
+	exit ;;
20f812
+    *:AIX:*:[4567])
20f812
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
20f812
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
20f812
 		IBM_ARCH=rs6000
20f812
@@ -544,28 +570,28 @@
20f812
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
20f812
 	fi
20f812
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:AIX:*:*)
20f812
 	echo rs6000-ibm-aix
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
20f812
 	echo romp-ibm-bsd4.4
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
20f812
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
20f812
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
20f812
+	exit ;;                             # report: romp-ibm BSD 4.3
20f812
     *:BOSX:*:*)
20f812
 	echo rs6000-bull-bosx
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     DPX/2?00:B.O.S.:*:*)
20f812
 	echo m68k-bull-sysv3
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     9000/[34]??:4.3bsd:1.*:*)
20f812
 	echo m68k-hp-bsd
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
20f812
 	echo m68k-hp-bsd4.4
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     9000/[34678]??:HP-UX:*:*)
20f812
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
20f812
 	case "${UNAME_MACHINE}" in
20f812
@@ -574,52 +600,52 @@
20f812
 	    9000/[678][0-9][0-9])
20f812
 		if [ -x /usr/bin/getconf ]; then
20f812
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
20f812
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
20f812
-                    case "${sc_cpu_version}" in
20f812
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
20f812
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
20f812
-                      532)                      # CPU_PA_RISC2_0
20f812
-                        case "${sc_kernel_bits}" in
20f812
-                          32) HP_ARCH="hppa2.0n" ;;
20f812
-                          64) HP_ARCH="hppa2.0w" ;;
20f812
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
20f812
+		    case "${sc_cpu_version}" in
20f812
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
20f812
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
20f812
+		      532)                      # CPU_PA_RISC2_0
20f812
+			case "${sc_kernel_bits}" in
20f812
+			  32) HP_ARCH="hppa2.0n" ;;
20f812
+			  64) HP_ARCH="hppa2.0w" ;;
20f812
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
20f812
-                        esac ;;
20f812
-                    esac
20f812
+			esac ;;
20f812
+		    esac
20f812
 		fi
20f812
 		if [ "${HP_ARCH}" = "" ]; then
20f812
 		    eval $set_cc_for_build
20f812
-		    sed 's/^              //' << EOF >$dummy.c
20f812
+		    sed 's/^		//' << EOF >$dummy.c
20f812
+
20f812
+		#define _HPUX_SOURCE
20f812
+		#include <stdlib.h>
20f812
+		#include <unistd.h>
20f812
 
20f812
-              #define _HPUX_SOURCE
20f812
-              #include <stdlib.h>
20f812
-              #include <unistd.h>
20f812
-
20f812
-              int main ()
20f812
-              {
20f812
-              #if defined(_SC_KERNEL_BITS)
20f812
-                  long bits = sysconf(_SC_KERNEL_BITS);
20f812
-              #endif
20f812
-                  long cpu  = sysconf (_SC_CPU_VERSION);
20f812
-
20f812
-                  switch (cpu)
20f812
-              	{
20f812
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
20f812
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
20f812
-              	case CPU_PA_RISC2_0:
20f812
-              #if defined(_SC_KERNEL_BITS)
20f812
-              	    switch (bits)
20f812
-              		{
20f812
-              		case 64: puts ("hppa2.0w"); break;
20f812
-              		case 32: puts ("hppa2.0n"); break;
20f812
-              		default: puts ("hppa2.0"); break;
20f812
-              		} break;
20f812
-              #else  /* !defined(_SC_KERNEL_BITS) */
20f812
-              	    puts ("hppa2.0"); break;
20f812
-              #endif
20f812
-              	default: puts ("hppa1.0"); break;
20f812
-              	}
20f812
-                  exit (0);
20f812
-              }
20f812
+		int main ()
20f812
+		{
20f812
+		#if defined(_SC_KERNEL_BITS)
20f812
+		    long bits = sysconf(_SC_KERNEL_BITS);
20f812
+		#endif
20f812
+		    long cpu  = sysconf (_SC_CPU_VERSION);
20f812
+
20f812
+		    switch (cpu)
20f812
+			{
20f812
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
20f812
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
20f812
+			case CPU_PA_RISC2_0:
20f812
+		#if defined(_SC_KERNEL_BITS)
20f812
+			    switch (bits)
20f812
+				{
20f812
+				case 64: puts ("hppa2.0w"); break;
20f812
+				case 32: puts ("hppa2.0n"); break;
20f812
+				default: puts ("hppa2.0"); break;
20f812
+				} break;
20f812
+		#else  /* !defined(_SC_KERNEL_BITS) */
20f812
+			    puts ("hppa2.0"); break;
20f812
+		#endif
20f812
+			default: puts ("hppa1.0"); break;
20f812
+			}
20f812
+		    exit (0);
20f812
+		}
20f812
 EOF
20f812
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
20f812
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
20f812
@@ -627,9 +653,19 @@
20f812
 	esac
20f812
 	if [ ${HP_ARCH} = "hppa2.0w" ]
20f812
 	then
20f812
-	    # avoid double evaluation of $set_cc_for_build
20f812
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
20f812
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
20f812
+	    eval $set_cc_for_build
20f812
+
20f812
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
20f812
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
20f812
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
20f812
+	    #
20f812
+	    # $ CC_FOR_BUILD=cc ./config.guess
20f812
+	    # => hppa2.0w-hp-hpux11.23
20f812
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
20f812
+	    # => hppa64-hp-hpux11.23
20f812
+
20f812
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
20f812
+		grep -q __LP64__
20f812
 	    then
20f812
 		HP_ARCH="hppa2.0w"
20f812
 	    else
20f812
@@ -637,11 +673,11 @@
20f812
 	    fi
20f812
 	fi
20f812
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     ia64:HP-UX:*:*)
20f812
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
20f812
 	echo ia64-hp-hpux${HPUX_REV}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     3050*:HI-UX:*:*)
20f812
 	eval $set_cc_for_build
20f812
 	sed 's/^	//' << EOF >$dummy.c
20f812
@@ -669,211 +705,269 @@
20f812
 	  exit (0);
20f812
 	}
20f812
 EOF
20f812
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
20f812
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
20f812
+		{ echo "$SYSTEM_NAME"; exit; }
20f812
 	echo unknown-hitachi-hiuxwe2
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
20f812
 	echo hppa1.1-hp-bsd
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     9000/8??:4.3bsd:*:*)
20f812
 	echo hppa1.0-hp-bsd
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
20f812
 	echo hppa1.0-hp-mpeix
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
20f812
 	echo hppa1.1-hp-osf
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     hp8??:OSF1:*:*)
20f812
 	echo hppa1.0-hp-osf
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     i*86:OSF1:*:*)
20f812
 	if [ -x /usr/sbin/sysversion ] ; then
20f812
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
20f812
 	else
20f812
 	    echo ${UNAME_MACHINE}-unknown-osf1
20f812
 	fi
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     parisc*:Lites*:*:*)
20f812
 	echo hppa1.1-hp-lites
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
20f812
 	echo c1-convex-bsd
20f812
-        exit 0 ;;
20f812
+	exit ;;
20f812
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
20f812
 	if getsysinfo -f scalar_acc
20f812
 	then echo c32-convex-bsd
20f812
 	else echo c2-convex-bsd
20f812
 	fi
20f812
-        exit 0 ;;
20f812
+	exit ;;
20f812
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
20f812
 	echo c34-convex-bsd
20f812
-        exit 0 ;;
20f812
+	exit ;;
20f812
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
20f812
 	echo c38-convex-bsd
20f812
-        exit 0 ;;
20f812
+	exit ;;
20f812
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
20f812
 	echo c4-convex-bsd
20f812
-        exit 0 ;;
20f812
+	exit ;;
20f812
     CRAY*Y-MP:*:*:*)
20f812
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     CRAY*[A-Z]90:*:*:*)
20f812
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
20f812
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
20f812
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
20f812
 	      -e 's/\.[^.]*$/.X/'
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     CRAY*TS:*:*:*)
20f812
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     CRAY*T3E:*:*:*)
20f812
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     CRAY*SV1:*:*:*)
20f812
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:UNICOS/mp:*:*)
20f812
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
20f812
-	exit 0 ;;
20f812
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
20f812
+	exit ;;
20f812
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
20f812
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
20f812
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
20f812
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
20f812
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
20f812
-        exit 0 ;;
20f812
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
20f812
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
20f812
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
20f812
+	exit ;;
20f812
+    5000:UNIX_System_V:4.*:*)
20f812
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
20f812
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
20f812
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
20f812
+	exit ;;
20f812
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
20f812
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     sparc*:BSD/OS:*:*)
20f812
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:BSD/OS:*:*)
20f812
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
20f812
-	# Determine whether the default compiler uses glibc.
20f812
-	eval $set_cc_for_build
20f812
-	sed 's/^	//' << EOF >$dummy.c
20f812
-	#include <features.h>
20f812
-	#if __GLIBC__ >= 2
20f812
-	LIBC=gnu
20f812
-	#else
20f812
-	LIBC=
20f812
-	#endif
20f812
-EOF
20f812
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
20f812
-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
20f812
-	# FreeBSD's kernel, but not the complete OS.
20f812
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
20f812
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    *:FreeBSD:*:*)
20f812
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
20f812
+	case ${UNAME_PROCESSOR} in
20f812
+	    amd64)
20f812
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
20f812
+	    *)
20f812
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
20f812
+	esac
20f812
+	exit ;;
20f812
     i*:CYGWIN*:*)
20f812
 	echo ${UNAME_MACHINE}-pc-cygwin
20f812
-	exit 0 ;;
20f812
-    i*:MINGW*:*)
20f812
+	exit ;;
20f812
+    *:MINGW64*:*)
20f812
+	echo ${UNAME_MACHINE}-pc-mingw64
20f812
+	exit ;;
20f812
+    *:MINGW*:*)
20f812
 	echo ${UNAME_MACHINE}-pc-mingw32
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    i*:MSYS*:*)
20f812
+	echo ${UNAME_MACHINE}-pc-msys
20f812
+	exit ;;
20f812
+    i*:windows32*:*)
20f812
+	# uname -m includes "-pc" on this system.
20f812
+	echo ${UNAME_MACHINE}-mingw32
20f812
+	exit ;;
20f812
     i*:PW*:*)
20f812
 	echo ${UNAME_MACHINE}-pc-pw32
20f812
-	exit 0 ;;
20f812
-    x86:Interix*:[34]*)
20f812
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    *:Interix*:*)
20f812
+	case ${UNAME_MACHINE} in
20f812
+	    x86)
20f812
+		echo i586-pc-interix${UNAME_RELEASE}
20f812
+		exit ;;
20f812
+	    authenticamd | genuineintel | EM64T)
20f812
+		echo x86_64-unknown-interix${UNAME_RELEASE}
20f812
+		exit ;;
20f812
+	    IA64)
20f812
+		echo ia64-unknown-interix${UNAME_RELEASE}
20f812
+		exit ;;
20f812
+	esac ;;
20f812
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
20f812
 	echo i${UNAME_MACHINE}-pc-mks
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    8664:Windows_NT:*)
20f812
+	echo x86_64-pc-mks
20f812
+	exit ;;
20f812
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
20f812
 	# How do we know it's Interix rather than the generic POSIX subsystem?
20f812
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
20f812
 	# UNAME_MACHINE based on the output of uname instead of i386?
20f812
 	echo i586-pc-interix
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     i*:UWIN*:*)
20f812
 	echo ${UNAME_MACHINE}-pc-uwin
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
20f812
+	echo x86_64-unknown-cygwin
20f812
+	exit ;;
20f812
     p*:CYGWIN*:*)
20f812
 	echo powerpcle-unknown-cygwin
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     prep*:SunOS:5.*:*)
20f812
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:GNU:*:*)
20f812
+	# the GNU system
20f812
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    *:GNU/*:*:*)
20f812
+	# other systems with GNU libc and userland
20f812
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
20f812
+	exit ;;
20f812
     i*86:Minix:*:*)
20f812
 	echo ${UNAME_MACHINE}-pc-minix
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    aarch64:Linux:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
+	exit ;;
20f812
+    aarch64_be:Linux:*:*)
20f812
+	UNAME_MACHINE=aarch64_be
20f812
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
+	exit ;;
20f812
+    alpha:Linux:*:*)
20f812
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
20f812
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
20f812
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
20f812
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
20f812
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
20f812
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
20f812
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
20f812
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
20f812
+	esac
20f812
+	objdump --private-headers /bin/sh | grep -q ld.so.1
20f812
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
20f812
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
20f812
+	exit ;;
20f812
     arm*:Linux:*:*)
20f812
+	eval $set_cc_for_build
20f812
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
20f812
+	    | grep -q __ARM_EABI__
20f812
+	then
20f812
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
+	else
20f812
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
20f812
+		| grep -q __ARM_PCS_VFP
20f812
+	    then
20f812
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
20f812
+	    else
20f812
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
20f812
+	    fi
20f812
+	fi
20f812
+	exit ;;
20f812
+    avr32*:Linux:*:*)
20f812
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     cris:Linux:*:*)
20f812
-	echo cris-axis-linux-gnu
20f812
-	exit 0 ;;
20f812
-    ia64:Linux:*:*)
20f812
+	echo ${UNAME_MACHINE}-axis-linux-gnu
20f812
+	exit ;;
20f812
+    crisv32:Linux:*:*)
20f812
+	echo ${UNAME_MACHINE}-axis-linux-gnu
20f812
+	exit ;;
20f812
+    frv:Linux:*:*)
20f812
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
-	exit 0 ;;
20f812
-    m68*:Linux:*:*)
20f812
+	exit ;;
20f812
+    hexagon:Linux:*:*)
20f812
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
-	exit 0 ;;
20f812
-    mips:Linux:*:*)
20f812
+	exit ;;
20f812
+    i*86:Linux:*:*)
20f812
+	LIBC=gnu
20f812
 	eval $set_cc_for_build
20f812
 	sed 's/^	//' << EOF >$dummy.c
20f812
-	#undef CPU
20f812
-	#undef mips
20f812
-	#undef mipsel
20f812
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
20f812
-	CPU=mipsel
20f812
-	#else
20f812
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
20f812
-	CPU=mips
20f812
-	#else
20f812
-	CPU=
20f812
-	#endif
20f812
+	#ifdef __dietlibc__
20f812
+	LIBC=dietlibc
20f812
 	#endif
20f812
 EOF
20f812
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
20f812
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
20f812
-	;;
20f812
-    mips64:Linux:*:*)
20f812
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
20f812
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
20f812
+	exit ;;
20f812
+    ia64:Linux:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
+	exit ;;
20f812
+    m32r*:Linux:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
+	exit ;;
20f812
+    m68*:Linux:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
+	exit ;;
20f812
+    mips:Linux:*:* | mips64:Linux:*:*)
20f812
 	eval $set_cc_for_build
20f812
 	sed 's/^	//' << EOF >$dummy.c
20f812
 	#undef CPU
20f812
-	#undef mips64
20f812
-	#undef mips64el
20f812
+	#undef ${UNAME_MACHINE}
20f812
+	#undef ${UNAME_MACHINE}el
20f812
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
20f812
-	CPU=mips64el
20f812
+	CPU=${UNAME_MACHINE}el
20f812
 	#else
20f812
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
20f812
-	CPU=mips64
20f812
+	CPU=${UNAME_MACHINE}
20f812
 	#else
20f812
 	CPU=
20f812
 	#endif
20f812
 	#endif
20f812
 EOF
20f812
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
20f812
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
20f812
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
20f812
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
20f812
 	;;
20f812
-    ppc:Linux:*:*)
20f812
-	echo powerpc-unknown-linux-gnu
20f812
-	exit 0 ;;
20f812
-    ppc64:Linux:*:*)
20f812
-	echo powerpc64-unknown-linux-gnu
20f812
-	exit 0 ;;
20f812
-    alpha:Linux:*:*)
20f812
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
20f812
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
20f812
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
20f812
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
20f812
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
20f812
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
20f812
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
20f812
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
20f812
-        esac
20f812
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
20f812
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
20f812
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
20f812
-	exit 0 ;;
20f812
+    or32:Linux:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
+	exit ;;
20f812
+    padre:Linux:*:*)
20f812
+	echo sparc-unknown-linux-gnu
20f812
+	exit ;;
20f812
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
20f812
+	echo hppa64-unknown-linux-gnu
20f812
+	exit ;;
20f812
     parisc:Linux:*:* | hppa:Linux:*:*)
20f812
 	# Look for CPU level
20f812
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
20f812
@@ -881,109 +975,71 @@
20f812
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
20f812
 	  *)    echo hppa-unknown-linux-gnu ;;
20f812
 	esac
20f812
-	exit 0 ;;
20f812
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
20f812
-	echo hppa64-unknown-linux-gnu
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    ppc64:Linux:*:*)
20f812
+	echo powerpc64-unknown-linux-gnu
20f812
+	exit ;;
20f812
+    ppc:Linux:*:*)
20f812
+	echo powerpc-unknown-linux-gnu
20f812
+	exit ;;
20f812
     s390:Linux:*:* | s390x:Linux:*:*)
20f812
 	echo ${UNAME_MACHINE}-ibm-linux
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     sh64*:Linux:*:*)
20f812
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
-	exit 0 ;;
20f812
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
+	exit ;;
20f812
     sh*:Linux:*:*)
20f812
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     sparc:Linux:*:* | sparc64:Linux:*:*)
20f812
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    tile*:Linux:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
+	exit ;;
20f812
+    vax:Linux:*:*)
20f812
+	echo ${UNAME_MACHINE}-dec-linux-gnu
20f812
+	exit ;;
20f812
     x86_64:Linux:*:*)
20f812
-	echo x86_64-unknown-linux-gnu
20f812
-	exit 0 ;;
20f812
-    i*86:Linux:*:*)
20f812
-	# The BFD linker knows what the default object file format is, so
20f812
-	# first see if it will tell us. cd to the root directory to prevent
20f812
-	# problems with other programs or directories called `ld' in the path.
20f812
-	# Set LC_ALL=C to ensure ld outputs messages in English.
20f812
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
20f812
-			 | sed -ne '/supported targets:/!d
20f812
-				    s/[ 	][ 	]*/ /g
20f812
-				    s/.*supported targets: *//
20f812
-				    s/ .*//
20f812
-				    p'`
20f812
-        case "$ld_supported_targets" in
20f812
-	  elf32-i386)
20f812
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
20f812
-		;;
20f812
-	  a.out-i386-linux)
20f812
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
20f812
-		exit 0 ;;
20f812
-	  coff-i386)
20f812
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
20f812
-		exit 0 ;;
20f812
-	  "")
20f812
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
20f812
-		# one that does not give us useful --help.
20f812
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
20f812
-		exit 0 ;;
20f812
-	esac
20f812
-	# Determine whether the default compiler is a.out or elf
20f812
-	eval $set_cc_for_build
20f812
-	sed 's/^	//' << EOF >$dummy.c
20f812
-	#include <features.h>
20f812
-	#ifdef __ELF__
20f812
-	# ifdef __GLIBC__
20f812
-	#  if __GLIBC__ >= 2
20f812
-	LIBC=gnu
20f812
-	#  else
20f812
-	LIBC=gnulibc1
20f812
-	#  endif
20f812
-	# else
20f812
-	LIBC=gnulibc1
20f812
-	# endif
20f812
-	#else
20f812
-	#ifdef __INTEL_COMPILER
20f812
-	LIBC=gnu
20f812
-	#else
20f812
-	LIBC=gnuaout
20f812
-	#endif
20f812
-	#endif
20f812
-EOF
20f812
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
20f812
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
20f812
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
20f812
-	;;
20f812
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
+	exit ;;
20f812
+    xtensa*:Linux:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
20f812
+	exit ;;
20f812
     i*86:DYNIX/ptx:4*:*)
20f812
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
20f812
 	# earlier versions are messed up and put the nodename in both
20f812
 	# sysname and nodename.
20f812
 	echo i386-sequent-sysv4
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     i*86:UNIX_SV:4.2MP:2.*)
20f812
-        # Unixware is an offshoot of SVR4, but it has its own version
20f812
-        # number series starting with 2...
20f812
-        # I am not positive that other SVR4 systems won't match this,
20f812
+	# Unixware is an offshoot of SVR4, but it has its own version
20f812
+	# number series starting with 2...
20f812
+	# I am not positive that other SVR4 systems won't match this,
20f812
 	# I just have to hope.  -- rms.
20f812
-        # Use sysv4.2uw... so that sysv4* matches it.
20f812
+	# Use sysv4.2uw... so that sysv4* matches it.
20f812
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     i*86:OS/2:*:*)
20f812
 	# If we were able to find `uname', then EMX Unix compatibility
20f812
 	# is probably installed.
20f812
 	echo ${UNAME_MACHINE}-pc-os2-emx
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     i*86:XTS-300:*:STOP)
20f812
 	echo ${UNAME_MACHINE}-unknown-stop
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     i*86:atheos:*:*)
20f812
 	echo ${UNAME_MACHINE}-unknown-atheos
20f812
-	exit 0 ;;
20f812
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
20f812
+	exit ;;
20f812
+    i*86:syllable:*:*)
20f812
+	echo ${UNAME_MACHINE}-pc-syllable
20f812
+	exit ;;
20f812
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
20f812
 	echo i386-unknown-lynxos${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     i*86:*DOS:*:*)
20f812
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
20f812
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
20f812
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
20f812
@@ -991,15 +1047,16 @@
20f812
 	else
20f812
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
20f812
 	fi
20f812
-	exit 0 ;;
20f812
-    i*86:*:5:[78]*)
20f812
+	exit ;;
20f812
+    i*86:*:5:[678]*)
20f812
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
20f812
 	case `/bin/uname -X | grep "^Machine"` in
20f812
 	    *486*)	     UNAME_MACHINE=i486 ;;
20f812
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
20f812
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
20f812
 	esac
20f812
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     i*86:*:3.2:*)
20f812
 	if test -f /usr/options/cb.name; then
20f812
 		UNAME_REL=`sed -n 's/.*Version //p' 
20f812
@@ -1017,73 +1074,86 @@
20f812
 	else
20f812
 		echo ${UNAME_MACHINE}-pc-sysv32
20f812
 	fi
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     pc:*:*:*)
20f812
 	# Left here for compatibility:
20f812
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
20f812
-        # the processor, so we play safe by assuming i386.
20f812
-	echo i386-pc-msdosdjgpp
20f812
-        exit 0 ;;
20f812
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
20f812
+	# the processor, so we play safe by assuming i586.
20f812
+	# Note: whatever this is, it MUST be the same as what config.sub
20f812
+	# prints for the "djgpp" host, or else GDB configury will decide that
20f812
+	# this is a cross-build.
20f812
+	echo i586-pc-msdosdjgpp
20f812
+	exit ;;
20f812
     Intel:Mach:3*:*)
20f812
 	echo i386-pc-mach3
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     paragon:*:*:*)
20f812
 	echo i860-intel-osf1
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     i860:*:4.*:*) # i860-SVR4
20f812
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
20f812
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
20f812
 	else # Add other i860-SVR4 vendors below as they are discovered.
20f812
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
20f812
 	fi
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     mini*:CTIX:SYS*5:*)
20f812
 	# "miniframe"
20f812
 	echo m68010-convergent-sysv
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     mc68k:UNIX:SYSTEM5:3.51m)
20f812
 	echo m68k-convergent-sysv
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     M680?0:D-NIX:5.3:*)
20f812
 	echo m68k-diab-dnix
20f812
-	exit 0 ;;
20f812
-    M68*:*:R3V[567]*:*)
20f812
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
20f812
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
20f812
+	exit ;;
20f812
+    M68*:*:R3V[5678]*:*)
20f812
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
20f812
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
20f812
 	OS_REL=''
20f812
 	test -r /etc/.relid \
20f812
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
20f812
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
20f812
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
20f812
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
20f812
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
20f812
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
20f812
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
20f812
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
20f812
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
20f812
-          && echo i486-ncr-sysv4 && exit 0 ;;
20f812
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
20f812
+	  && { echo i486-ncr-sysv4; exit; } ;;
20f812
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
20f812
+	OS_REL='.3'
20f812
+	test -r /etc/.relid \
20f812
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
20f812
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
20f812
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
20f812
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
20f812
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
20f812
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
20f812
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
20f812
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
20f812
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     mc68030:UNIX_System_V:4.*:*)
20f812
 	echo m68k-atari-sysv4
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     TSUNAMI:LynxOS:2.*:*)
20f812
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     rs6000:LynxOS:2.*:*)
20f812
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
20f812
+	exit ;;
20f812
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
20f812
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     SM[BE]S:UNIX_SV:*:*)
20f812
 	echo mips-dde-sysv${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     RM*:ReliantUNIX-*:*:*)
20f812
 	echo mips-sni-sysv4
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     RM*:SINIX-*:*:*)
20f812
 	echo mips-sni-sysv4
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:SINIX-*:*:*)
20f812
 	if uname -p 2>/dev/null >/dev/null ; then
20f812
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
20f812
@@ -1091,68 +1161,97 @@
20f812
 	else
20f812
 		echo ns32k-sni-sysv
20f812
 	fi
20f812
-	exit 0 ;;
20f812
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
20f812
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
20f812
-        echo i586-unisys-sysv4
20f812
-        exit 0 ;;
20f812
+	exit ;;
20f812
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
20f812
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
20f812
+	echo i586-unisys-sysv4
20f812
+	exit ;;
20f812
     *:UNIX_System_V:4*:FTX*)
20f812
 	# From Gerald Hewes <hewes@openmarket.com>.
20f812
 	# How about differentiating between stratus architectures? -djm
20f812
 	echo hppa1.1-stratus-sysv4
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:*:*:FTX*)
20f812
 	# From seanf@swdc.stratus.com.
20f812
 	echo i860-stratus-sysv4
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    i*86:VOS:*:*)
20f812
+	# From Paul.Green@stratus.com.
20f812
+	echo ${UNAME_MACHINE}-stratus-vos
20f812
+	exit ;;
20f812
     *:VOS:*:*)
20f812
 	# From Paul.Green@stratus.com.
20f812
 	echo hppa1.1-stratus-vos
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     mc68*:A/UX:*:*)
20f812
 	echo m68k-apple-aux${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     news*:NEWS-OS:6*:*)
20f812
 	echo mips-sony-newsos6
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
20f812
 	if [ -d /usr/nec ]; then
20f812
-	        echo mips-nec-sysv${UNAME_RELEASE}
20f812
+		echo mips-nec-sysv${UNAME_RELEASE}
20f812
 	else
20f812
-	        echo mips-unknown-sysv${UNAME_RELEASE}
20f812
+		echo mips-unknown-sysv${UNAME_RELEASE}
20f812
 	fi
20f812
-        exit 0 ;;
20f812
+	exit ;;
20f812
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
20f812
 	echo powerpc-be-beos
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
20f812
 	echo powerpc-apple-beos
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
20f812
 	echo i586-pc-beos
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
20f812
+	echo i586-pc-haiku
20f812
+	exit ;;
20f812
+    x86_64:Haiku:*:*)
20f812
+	echo x86_64-unknown-haiku
20f812
+	exit ;;
20f812
     SX-4:SUPER-UX:*:*)
20f812
 	echo sx4-nec-superux${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     SX-5:SUPER-UX:*:*)
20f812
 	echo sx5-nec-superux${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     SX-6:SUPER-UX:*:*)
20f812
 	echo sx6-nec-superux${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
+    SX-7:SUPER-UX:*:*)
20f812
+	echo sx7-nec-superux${UNAME_RELEASE}
20f812
+	exit ;;
20f812
+    SX-8:SUPER-UX:*:*)
20f812
+	echo sx8-nec-superux${UNAME_RELEASE}
20f812
+	exit ;;
20f812
+    SX-8R:SUPER-UX:*:*)
20f812
+	echo sx8r-nec-superux${UNAME_RELEASE}
20f812
+	exit ;;
20f812
     Power*:Rhapsody:*:*)
20f812
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:Rhapsody:*:*)
20f812
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:Darwin:*:*)
20f812
-	case `uname -p` in
20f812
-	    *86) UNAME_PROCESSOR=i686 ;;
20f812
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
20f812
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
20f812
+	case $UNAME_PROCESSOR in
20f812
+	    i386)
20f812
+		eval $set_cc_for_build
20f812
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
20f812
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
20f812
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
20f812
+		      grep IS_64BIT_ARCH >/dev/null
20f812
+		  then
20f812
+		      UNAME_PROCESSOR="x86_64"
20f812
+		  fi
20f812
+		fi ;;
20f812
+	    unknown) UNAME_PROCESSOR=powerpc ;;
20f812
 	esac
20f812
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
20f812
 	UNAME_PROCESSOR=`uname -p`
20f812
 	if test "$UNAME_PROCESSOR" = "x86"; then
20f812
@@ -1160,22 +1259,28 @@
20f812
 		UNAME_MACHINE=pc
20f812
 	fi
20f812
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:QNX:*:4*)
20f812
 	echo i386-pc-qnx
20f812
-	exit 0 ;;
20f812
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
20f812
+	exit ;;
20f812
+    NEO-?:NONSTOP_KERNEL:*:*)
20f812
+	echo neo-tandem-nsk${UNAME_RELEASE}
20f812
+	exit ;;
20f812
+    NSE-*:NONSTOP_KERNEL:*:*)
20f812
+	echo nse-tandem-nsk${UNAME_RELEASE}
20f812
+	exit ;;
20f812
+    NSR-?:NONSTOP_KERNEL:*:*)
20f812
 	echo nsr-tandem-nsk${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:NonStop-UX:*:*)
20f812
 	echo mips-compaq-nonstopux
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     BS2000:POSIX*:*:*)
20f812
 	echo bs2000-siemens-sysv
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     DS/*:UNIX_System_V:*:*)
20f812
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:Plan9:*:*)
20f812
 	# "uname -m" is not consistent, so use $cputype instead. 386
20f812
 	# is converted to i386 for consistency with other x86
20f812
@@ -1186,33 +1291,55 @@
20f812
 	    UNAME_MACHINE="$cputype"
20f812
 	fi
20f812
 	echo ${UNAME_MACHINE}-unknown-plan9
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:TOPS-10:*:*)
20f812
 	echo pdp10-unknown-tops10
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:TENEX:*:*)
20f812
 	echo pdp10-unknown-tenex
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
20f812
 	echo pdp10-dec-tops20
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
20f812
 	echo pdp10-xkl-tops20
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:TOPS-20:*:*)
20f812
 	echo pdp10-unknown-tops20
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     *:ITS:*:*)
20f812
 	echo pdp10-unknown-its
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     SEI:*:*:SEIUX)
20f812
-        echo mips-sei-seiux${UNAME_RELEASE}
20f812
-	exit 0 ;;
20f812
+	echo mips-sei-seiux${UNAME_RELEASE}
20f812
+	exit ;;
20f812
+    *:DragonFly:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
20f812
+	exit ;;
20f812
+    *:*VMS:*:*)
20f812
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
20f812
+	case "${UNAME_MACHINE}" in
20f812
+	    A*) echo alpha-dec-vms ; exit ;;
20f812
+	    I*) echo ia64-dec-vms ; exit ;;
20f812
+	    V*) echo vax-dec-vms ; exit ;;
20f812
+	esac ;;
20f812
+    *:XENIX:*:SysV)
20f812
+	echo i386-pc-xenix
20f812
+	exit ;;
20f812
+    i*86:skyos:*:*)
20f812
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
20f812
+	exit ;;
20f812
+    i*86:rdos:*:*)
20f812
+	echo ${UNAME_MACHINE}-pc-rdos
20f812
+	exit ;;
20f812
+    i*86:AROS:*:*)
20f812
+	echo ${UNAME_MACHINE}-pc-aros
20f812
+	exit ;;
20f812
+    x86_64:VMkernel:*:*)
20f812
+	echo ${UNAME_MACHINE}-unknown-esx
20f812
+	exit ;;
20f812
 esac
20f812
 
20f812
-#echo '(No uname command or uname output not recognized.)' 1>&2
20f812
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
20f812
-
20f812
 eval $set_cc_for_build
20f812
 cat >$dummy.c <
20f812
 #ifdef _SEQUENT_
20f812
@@ -1230,16 +1357,16 @@
20f812
 #include <sys/param.h>
20f812
   printf ("m68k-sony-newsos%s\n",
20f812
 #ifdef NEWSOS4
20f812
-          "4"
20f812
+	"4"
20f812
 #else
20f812
-	  ""
20f812
+	""
20f812
 #endif
20f812
-         ); exit (0);
20f812
+	); exit (0);
20f812
 #endif
20f812
 #endif
20f812
 
20f812
 #if defined (__arm) && defined (__acorn) && defined (__unix)
20f812
-  printf ("arm-acorn-riscix"); exit (0);
20f812
+  printf ("arm-acorn-riscix\n"); exit (0);
20f812
 #endif
20f812
 
20f812
 #if defined (hp300) && !defined (hpux)
20f812
@@ -1328,11 +1455,12 @@
20f812
 }
20f812
 EOF
20f812
 
20f812
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
20f812
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
20f812
+	{ echo "$SYSTEM_NAME"; exit; }
20f812
 
20f812
 # Apollos put the system type in the environment.
20f812
 
20f812
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
20f812
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
20f812
 
20f812
 # Convex versions that predate uname can use getsysinfo(1)
20f812
 
20f812
@@ -1341,22 +1469,22 @@
20f812
     case `getsysinfo -f cpu_type` in
20f812
     c1*)
20f812
 	echo c1-convex-bsd
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     c2*)
20f812
 	if getsysinfo -f scalar_acc
20f812
 	then echo c32-convex-bsd
20f812
 	else echo c2-convex-bsd
20f812
 	fi
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     c34*)
20f812
 	echo c34-convex-bsd
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     c38*)
20f812
 	echo c38-convex-bsd
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     c4*)
20f812
 	echo c4-convex-bsd
20f812
-	exit 0 ;;
20f812
+	exit ;;
20f812
     esac
20f812
 fi
20f812
 
20f812
@@ -1367,7 +1495,9 @@
20f812
 the operating system you are using. It is advised that you
20f812
 download the most up to date version of the config scripts from
20f812
 
20f812
-    ftp://ftp.gnu.org/pub/gnu/config/
20f812
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
20f812
+and
20f812
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
20f812
 
20f812
 If the version you run ($0) is already up to date, please
20f812
 send the following data and any information you think might be
20f812
diff -urN libdbi-0.8.4/config.sub libdbi-0.8.4-aarch64/config.sub
20f812
--- libdbi-0.8.4/config.sub	2010-03-13 03:42:25.000000000 -0600
20f812
+++ libdbi-0.8.4-aarch64/config.sub	2013-03-08 01:31:15.650437648 -0600
20f812
@@ -1,9 +1,10 @@
20f812
 #! /bin/sh
20f812
 # Configuration validation subroutine script.
20f812
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
20f812
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
20f812
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
20f812
+#   2011, 2012 Free Software Foundation, Inc.
20f812
 
20f812
-timestamp='2003-07-04'
20f812
+timestamp='2012-10-10'
20f812
 
20f812
 # This file is (in principle) common to ALL GNU software.
20f812
 # The presence of a machine in this file suggests that SOME GNU software
20f812
@@ -20,23 +21,25 @@
20f812
 # GNU General Public License for more details.
20f812
 #
20f812
 # You should have received a copy of the GNU General Public License
20f812
-# along with this program; if not, write to the Free Software
20f812
-# Foundation, Inc., 59 Temple Place - Suite 330,
20f812
-# Boston, MA 02111-1307, USA.
20f812
-
20f812
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
20f812
+#
20f812
 # As a special exception to the GNU General Public License, if you
20f812
 # distribute this file as part of a program that contains a
20f812
 # configuration script generated by Autoconf, you may include it under
20f812
 # the same distribution terms that you use for the rest of that program.
20f812
 
20f812
+
20f812
 # Please send patches to <config-patches@gnu.org>.  Submit a context
20f812
-# diff and a properly formatted ChangeLog entry.
20f812
+# diff and a properly formatted GNU ChangeLog entry.
20f812
 #
20f812
 # Configuration subroutine to validate and canonicalize a configuration type.
20f812
 # Supply the specified configuration type as an argument.
20f812
 # If it is invalid, we print an error message on stderr and exit with code 1.
20f812
 # Otherwise, we print the canonical config type on stdout and succeed.
20f812
 
20f812
+# You can get the latest version of this script from:
20f812
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
20f812
+
20f812
 # This file is supposed to be the same for all GNU packages
20f812
 # and recognize all the CPU types, system types and aliases
20f812
 # that are meaningful with *any* GNU software.
20f812
@@ -70,7 +73,8 @@
20f812
 version="\
20f812
 GNU config.sub ($timestamp)
20f812
 
20f812
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
20f812
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
20f812
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
20f812
 Free Software Foundation, Inc.
20f812
 
20f812
 This is free software; see the source for copying conditions.  There is NO
20f812
@@ -83,11 +87,11 @@
20f812
 while test $# -gt 0 ; do
20f812
   case $1 in
20f812
     --time-stamp | --time* | -t )
20f812
-       echo "$timestamp" ; exit 0 ;;
20f812
+       echo "$timestamp" ; exit ;;
20f812
     --version | -v )
20f812
-       echo "$version" ; exit 0 ;;
20f812
+       echo "$version" ; exit ;;
20f812
     --help | --h* | -h )
20f812
-       echo "$usage"; exit 0 ;;
20f812
+       echo "$usage"; exit ;;
20f812
     -- )     # Stop option processing
20f812
        shift; break ;;
20f812
     - )	# Use stdin as input.
20f812
@@ -99,7 +103,7 @@
20f812
     *local*)
20f812
        # First pass through any local machine types.
20f812
        echo $1
20f812
-       exit 0;;
20f812
+       exit ;;
20f812
 
20f812
     * )
20f812
        break ;;
20f812
@@ -118,10 +122,18 @@
20f812
 # Here we must recognize all the valid KERNEL-OS combinations.
20f812
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
20f812
 case $maybe_os in
20f812
-  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
20f812
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
20f812
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
20f812
+  knetbsd*-gnu* | netbsd*-gnu* | \
20f812
+  kopensolaris*-gnu* | \
20f812
+  storm-chaos* | os2-emx* | rtmk-nova*)
20f812
     os=-$maybe_os
20f812
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
20f812
     ;;
20f812
+  android-linux)
20f812
+    os=-linux-android
20f812
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
20f812
+    ;;
20f812
   *)
20f812
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
20f812
     if [ $basic_machine != $1 ]
20f812
@@ -144,10 +156,13 @@
20f812
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
20f812
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
20f812
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
20f812
-	-apple | -axis)
20f812
+	-apple | -axis | -knuth | -cray | -microblaze*)
20f812
 		os=
20f812
 		basic_machine=$1
20f812
 		;;
20f812
+	-bluegene*)
20f812
+		os=-cnk
20f812
+		;;
20f812
 	-sim | -cisco | -oki | -wec | -winbond)
20f812
 		os=
20f812
 		basic_machine=$1
20f812
@@ -162,13 +177,17 @@
20f812
 		os=-chorusos
20f812
 		basic_machine=$1
20f812
 		;;
20f812
- 	-chorusrdb)
20f812
- 		os=-chorusrdb
20f812
+	-chorusrdb)
20f812
+		os=-chorusrdb
20f812
 		basic_machine=$1
20f812
- 		;;
20f812
+		;;
20f812
 	-hiux*)
20f812
 		os=-hiuxwe2
20f812
 		;;
20f812
+	-sco6)
20f812
+		os=-sco5v6
20f812
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
20f812
+		;;
20f812
 	-sco5)
20f812
 		os=-sco3.2v5
20f812
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
20f812
@@ -185,6 +204,10 @@
20f812
 		# Don't forget version if it is 3.2v4 or newer.
20f812
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
20f812
 		;;
20f812
+	-sco5v6*)
20f812
+		# Don't forget version if it is 3.2v4 or newer.
20f812
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
20f812
+		;;
20f812
 	-sco*)
20f812
 		os=-sco3.2v2
20f812
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
20f812
@@ -202,6 +225,12 @@
20f812
 	-isc*)
20f812
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
20f812
 		;;
20f812
+	-lynx*178)
20f812
+		os=-lynxos178
20f812
+		;;
20f812
+	-lynx*5)
20f812
+		os=-lynxos5
20f812
+		;;
20f812
 	-lynx*)
20f812
 		os=-lynxos
20f812
 		;;
20f812
@@ -226,55 +255,103 @@
20f812
 	# Some are omitted here because they have special meanings below.
20f812
 	1750a | 580 \
20f812
 	| a29k \
20f812
+	| aarch64 | aarch64_be \
20f812
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
20f812
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
20f812
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
20f812
+	| am33_2.0 \
20f812
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
20f812
+        | be32 | be64 \
20f812
+	| bfin \
20f812
 	| c4x | clipper \
20f812
 	| d10v | d30v | dlx | dsp16xx \
20f812
-	| fr30 | frv \
20f812
+	| epiphany \
20f812
+	| fido | fr30 | frv \
20f812
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
20f812
+	| hexagon \
20f812
 	| i370 | i860 | i960 | ia64 \
20f812
-	| ip2k \
20f812
-	| m32r | m68000 | m68k | m88k | mcore \
20f812
+	| ip2k | iq2000 \
20f812
+	| le32 | le64 \
20f812
+	| lm32 \
20f812
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
20f812
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
20f812
 	| mips | mipsbe | mipseb | mipsel | mipsle \
20f812
 	| mips16 \
20f812
 	| mips64 | mips64el \
20f812
-	| mips64vr | mips64vrel \
20f812
+	| mips64octeon | mips64octeonel \
20f812
 	| mips64orion | mips64orionel \
20f812
+	| mips64r5900 | mips64r5900el \
20f812
+	| mips64vr | mips64vrel \
20f812
 	| mips64vr4100 | mips64vr4100el \
20f812
 	| mips64vr4300 | mips64vr4300el \
20f812
 	| mips64vr5000 | mips64vr5000el \
20f812
+	| mips64vr5900 | mips64vr5900el \
20f812
 	| mipsisa32 | mipsisa32el \
20f812
 	| mipsisa32r2 | mipsisa32r2el \
20f812
 	| mipsisa64 | mipsisa64el \
20f812
+	| mipsisa64r2 | mipsisa64r2el \
20f812
 	| mipsisa64sb1 | mipsisa64sb1el \
20f812
 	| mipsisa64sr71k | mipsisa64sr71kel \
20f812
 	| mipstx39 | mipstx39el \
20f812
 	| mn10200 | mn10300 \
20f812
+	| moxie \
20f812
+	| mt \
20f812
 	| msp430 \
20f812
+	| nds32 | nds32le | nds32be \
20f812
+	| nios | nios2 \
20f812
 	| ns16k | ns32k \
20f812
-	| openrisc | or32 \
20f812
+	| open8 \
20f812
+	| or32 \
20f812
 	| pdp10 | pdp11 | pj | pjl \
20f812
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
20f812
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
20f812
 	| pyramid \
20f812
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
20f812
+	| rl78 | rx \
20f812
+	| score \
20f812
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
20f812
 	| sh64 | sh64le \
20f812
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
20f812
-	| strongarm \
20f812
-	| tahoe | thumb | tic4x | tic80 | tron \
20f812
-	| v850 | v850e \
20f812
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
20f812
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
20f812
+	| spu \
20f812
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
20f812
+	| ubicom32 \
20f812
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
20f812
 	| we32k \
20f812
-	| x86 | xscale | xstormy16 | xtensa \
20f812
-	| z8k)
20f812
+	| x86 | xc16x | xstormy16 | xtensa \
20f812
+	| z8k | z80)
20f812
 		basic_machine=$basic_machine-unknown
20f812
 		;;
20f812
-	m6811 | m68hc11 | m6812 | m68hc12)
20f812
-		# Motorola 68HC11/12.
20f812
+	c54x)
20f812
+		basic_machine=tic54x-unknown
20f812
+		;;
20f812
+	c55x)
20f812
+		basic_machine=tic55x-unknown
20f812
+		;;
20f812
+	c6x)
20f812
+		basic_machine=tic6x-unknown
20f812
+		;;
20f812
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
20f812
 		basic_machine=$basic_machine-unknown
20f812
 		os=-none
20f812
 		;;
20f812
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
20f812
 		;;
20f812
+	ms1)
20f812
+		basic_machine=mt-unknown
20f812
+		;;
20f812
+
20f812
+	strongarm | thumb | xscale)
20f812
+		basic_machine=arm-unknown
20f812
+		;;
20f812
+	xgate)
20f812
+		basic_machine=$basic_machine-unknown
20f812
+		os=-none
20f812
+		;;
20f812
+	xscaleeb)
20f812
+		basic_machine=armeb-unknown
20f812
+		;;
20f812
+
20f812
+	xscaleel)
20f812
+		basic_machine=armel-unknown
20f812
+		;;
20f812
 
20f812
 	# We use `pc' rather than `unknown'
20f812
 	# because (1) that's what they normally are, and
20f812
@@ -290,58 +367,81 @@
20f812
 	# Recognize the basic CPU types with company name.
20f812
 	580-* \
20f812
 	| a29k-* \
20f812
+	| aarch64-* | aarch64_be-* \
20f812
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
20f812
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
20f812
-	| alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \
20f812
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
20f812
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
20f812
-	| avr-* \
20f812
-	| bs2000-* \
20f812
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
20f812
-	| clipper-* | cydra-* \
20f812
+	| avr-* | avr32-* \
20f812
+	| be32-* | be64-* \
20f812
+	| bfin-* | bs2000-* \
20f812
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
20f812
+	| clipper-* | craynv-* | cydra-* \
20f812
 	| d10v-* | d30v-* | dlx-* \
20f812
 	| elxsi-* \
20f812
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
20f812
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
20f812
 	| h8300-* | h8500-* \
20f812
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
20f812
+	| hexagon-* \
20f812
 	| i*86-* | i860-* | i960-* | ia64-* \
20f812
-	| ip2k-* \
20f812
-	| m32r-* \
20f812
+	| ip2k-* | iq2000-* \
20f812
+	| le32-* | le64-* \
20f812
+	| lm32-* \
20f812
+	| m32c-* | m32r-* | m32rle-* \
20f812
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
20f812
-	| m88110-* | m88k-* | mcore-* \
20f812
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
20f812
+	| microblaze-* | microblazeel-* \
20f812
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
20f812
 	| mips16-* \
20f812
 	| mips64-* | mips64el-* \
20f812
-	| mips64vr-* | mips64vrel-* \
20f812
+	| mips64octeon-* | mips64octeonel-* \
20f812
 	| mips64orion-* | mips64orionel-* \
20f812
+	| mips64r5900-* | mips64r5900el-* \
20f812
+	| mips64vr-* | mips64vrel-* \
20f812
 	| mips64vr4100-* | mips64vr4100el-* \
20f812
 	| mips64vr4300-* | mips64vr4300el-* \
20f812
 	| mips64vr5000-* | mips64vr5000el-* \
20f812
+	| mips64vr5900-* | mips64vr5900el-* \
20f812
 	| mipsisa32-* | mipsisa32el-* \
20f812
 	| mipsisa32r2-* | mipsisa32r2el-* \
20f812
 	| mipsisa64-* | mipsisa64el-* \
20f812
+	| mipsisa64r2-* | mipsisa64r2el-* \
20f812
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
20f812
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
20f812
 	| mipstx39-* | mipstx39el-* \
20f812
+	| mmix-* \
20f812
+	| mt-* \
20f812
 	| msp430-* \
20f812
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
20f812
+	| nds32-* | nds32le-* | nds32be-* \
20f812
+	| nios-* | nios2-* \
20f812
+	| none-* | np1-* | ns16k-* | ns32k-* \
20f812
+	| open8-* \
20f812
 	| orion-* \
20f812
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
20f812
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
20f812
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
20f812
 	| pyramid-* \
20f812
-	| romp-* | rs6000-* \
20f812
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
20f812
+	| rl78-* | romp-* | rs6000-* | rx-* \
20f812
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
20f812
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
20f812
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
20f812
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
20f812
-	| tahoe-* | thumb-* \
20f812
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
20f812
+	| sparclite-* \
20f812
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
20f812
+	| tahoe-* \
20f812
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
20f812
+	| tile*-* \
20f812
 	| tron-* \
20f812
-	| v850-* | v850e-* | vax-* \
20f812
+	| ubicom32-* \
20f812
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
20f812
+	| vax-* \
20f812
 	| we32k-* \
20f812
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
20f812
-	| xtensa-* \
20f812
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
20f812
+	| xstormy16-* | xtensa*-* \
20f812
 	| ymp-* \
20f812
-	| z8k-*)
20f812
+	| z8k-* | z80-*)
20f812
+		;;
20f812
+	# Recognize the basic CPU types without company name, with glob match.
20f812
+	xtensa*)
20f812
+		basic_machine=$basic_machine-unknown
20f812
 		;;
20f812
 	# Recognize the various machine names and aliases which stand
20f812
 	# for a CPU type and a company and sometimes even an OS.
20f812
@@ -359,6 +459,9 @@
20f812
 		basic_machine=a29k-amd
20f812
 		os=-udi
20f812
 		;;
20f812
+	abacus)
20f812
+		basic_machine=abacus-unknown
20f812
+		;;
20f812
 	adobe68k)
20f812
 		basic_machine=m68010-adobe
20f812
 		os=-scout
20f812
@@ -376,6 +479,9 @@
20f812
 	amd64)
20f812
 		basic_machine=x86_64-pc
20f812
 		;;
20f812
+	amd64-*)
20f812
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
20f812
+		;;
20f812
 	amdahl)
20f812
 		basic_machine=580-amdahl
20f812
 		os=-sysv
20f812
@@ -399,6 +505,10 @@
20f812
 		basic_machine=m68k-apollo
20f812
 		os=-bsd
20f812
 		;;
20f812
+	aros)
20f812
+		basic_machine=i386-pc
20f812
+		os=-aros
20f812
+		;;
20f812
 	aux)
20f812
 		basic_machine=m68k-apple
20f812
 		os=-aux
20f812
@@ -407,10 +517,35 @@
20f812
 		basic_machine=ns32k-sequent
20f812
 		os=-dynix
20f812
 		;;
20f812
+	blackfin)
20f812
+		basic_machine=bfin-unknown
20f812
+		os=-linux
20f812
+		;;
20f812
+	blackfin-*)
20f812
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
20f812
+		os=-linux
20f812
+		;;
20f812
+	bluegene*)
20f812
+		basic_machine=powerpc-ibm
20f812
+		os=-cnk
20f812
+		;;
20f812
+	c54x-*)
20f812
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
20f812
+		;;
20f812
+	c55x-*)
20f812
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
20f812
+		;;
20f812
+	c6x-*)
20f812
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
20f812
+		;;
20f812
 	c90)
20f812
 		basic_machine=c90-cray
20f812
 		os=-unicos
20f812
 		;;
20f812
+	cegcc)
20f812
+		basic_machine=arm-unknown
20f812
+		os=-cegcc
20f812
+		;;
20f812
 	convex-c1)
20f812
 		basic_machine=c1-convex
20f812
 		os=-bsd
20f812
@@ -435,12 +570,27 @@
20f812
 		basic_machine=j90-cray
20f812
 		os=-unicos
20f812
 		;;
20f812
+	craynv)
20f812
+		basic_machine=craynv-cray
20f812
+		os=-unicosmp
20f812
+		;;
20f812
+	cr16 | cr16-*)
20f812
+		basic_machine=cr16-unknown
20f812
+		os=-elf
20f812
+		;;
20f812
 	crds | unos)
20f812
 		basic_machine=m68k-crds
20f812
 		;;
20f812
+	crisv32 | crisv32-* | etraxfs*)
20f812
+		basic_machine=crisv32-axis
20f812
+		;;
20f812
 	cris | cris-* | etrax*)
20f812
 		basic_machine=cris-axis
20f812
 		;;
20f812
+	crx)
20f812
+		basic_machine=crx-unknown
20f812
+		os=-elf
20f812
+		;;
20f812
 	da30 | da30-*)
20f812
 		basic_machine=m68k-da30
20f812
 		;;
20f812
@@ -463,6 +613,14 @@
20f812
 		basic_machine=m88k-motorola
20f812
 		os=-sysv3
20f812
 		;;
20f812
+	dicos)
20f812
+		basic_machine=i686-pc
20f812
+		os=-dicos
20f812
+		;;
20f812
+	djgpp)
20f812
+		basic_machine=i586-pc
20f812
+		os=-msdosdjgpp
20f812
+		;;
20f812
 	dpx20 | dpx20-*)
20f812
 		basic_machine=rs6000-bull
20f812
 		os=-bosx
20f812
@@ -574,7 +732,6 @@
20f812
 	i370-ibm* | ibm*)
20f812
 		basic_machine=i370-ibm
20f812
 		;;
20f812
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
20f812
 	i*86v32)
20f812
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
20f812
 		os=-sysv32
20f812
@@ -613,6 +770,14 @@
20f812
 		basic_machine=m68k-isi
20f812
 		os=-sysv
20f812
 		;;
20f812
+	m68knommu)
20f812
+		basic_machine=m68k-unknown
20f812
+		os=-linux
20f812
+		;;
20f812
+	m68knommu-*)
20f812
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
20f812
+		os=-linux
20f812
+		;;
20f812
 	m88k-omron*)
20f812
 		basic_machine=m88k-omron
20f812
 		;;
20f812
@@ -624,10 +789,21 @@
20f812
 		basic_machine=ns32k-utek
20f812
 		os=-sysv
20f812
 		;;
20f812
+	microblaze*)
20f812
+		basic_machine=microblaze-xilinx
20f812
+		;;
20f812
+	mingw64)
20f812
+		basic_machine=x86_64-pc
20f812
+		os=-mingw64
20f812
+		;;
20f812
 	mingw32)
20f812
 		basic_machine=i386-pc
20f812
 		os=-mingw32
20f812
 		;;
20f812
+	mingw32ce)
20f812
+		basic_machine=arm-unknown
20f812
+		os=-mingw32ce
20f812
+		;;
20f812
 	miniframe)
20f812
 		basic_machine=m68000-convergent
20f812
 		;;
20f812
@@ -641,10 +817,6 @@
20f812
 	mips3*)
20f812
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
20f812
 		;;
20f812
-	mmix*)
20f812
-		basic_machine=mmix-knuth
20f812
-		os=-mmixware
20f812
-		;;
20f812
 	monitor)
20f812
 		basic_machine=m68k-rom68k
20f812
 		os=-coff
20f812
@@ -657,10 +829,21 @@
20f812
 		basic_machine=i386-pc
20f812
 		os=-msdos
20f812
 		;;
20f812
+	ms1-*)
20f812
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
20f812
+		;;
20f812
+	msys)
20f812
+		basic_machine=i386-pc
20f812
+		os=-msys
20f812
+		;;
20f812
 	mvs)
20f812
 		basic_machine=i370-ibm
20f812
 		os=-mvs
20f812
 		;;
20f812
+	nacl)
20f812
+		basic_machine=le32-unknown
20f812
+		os=-nacl
20f812
+		;;
20f812
 	ncr3000)
20f812
 		basic_machine=i486-ncr
20f812
 		os=-sysv4
20f812
@@ -725,9 +908,11 @@
20f812
 	np1)
20f812
 		basic_machine=np1-gould
20f812
 		;;
20f812
-	nv1)
20f812
-		basic_machine=nv1-cray
20f812
-		os=-unicosmp
20f812
+	neo-tandem)
20f812
+		basic_machine=neo-tandem
20f812
+		;;
20f812
+	nse-tandem)
20f812
+		basic_machine=nse-tandem
20f812
 		;;
20f812
 	nsr-tandem)
20f812
 		basic_machine=nsr-tandem
20f812
@@ -736,9 +921,12 @@
20f812
 		basic_machine=hppa1.1-oki
20f812
 		os=-proelf
20f812
 		;;
20f812
-	or32 | or32-*)
20f812
+	openrisc | openrisc-*)
20f812
 		basic_machine=or32-unknown
20f812
-		os=-coff
20f812
+		;;
20f812
+	os400)
20f812
+		basic_machine=powerpc-ibm
20f812
+		os=-os400
20f812
 		;;
20f812
 	OSE68000 | ose68000)
20f812
 		basic_machine=m68000-ericsson
20f812
@@ -756,6 +944,14 @@
20f812
 		basic_machine=i860-intel
20f812
 		os=-osf
20f812
 		;;
20f812
+	parisc)
20f812
+		basic_machine=hppa-unknown
20f812
+		os=-linux
20f812
+		;;
20f812
+	parisc-*)
20f812
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
20f812
+		os=-linux
20f812
+		;;
20f812
 	pbd)
20f812
 		basic_machine=sparc-tti
20f812
 		;;
20f812
@@ -765,6 +961,12 @@
20f812
 	pc532 | pc532-*)
20f812
 		basic_machine=ns32k-pc532
20f812
 		;;
20f812
+	pc98)
20f812
+		basic_machine=i386-pc
20f812
+		;;
20f812
+	pc98-*)
20f812
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
20f812
+		;;
20f812
 	pentium | p5 | k5 | k6 | nexgen | viac3)
20f812
 		basic_machine=i586-pc
20f812
 		;;
20f812
@@ -794,9 +996,10 @@
20f812
 		;;
20f812
 	power)	basic_machine=power-ibm
20f812
 		;;
20f812
-	ppc)	basic_machine=powerpc-unknown
20f812
+	ppc | ppcbe)	basic_machine=powerpc-unknown
20f812
 		;;
20f812
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
20f812
+	ppc-* | ppcbe-*)
20f812
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
20f812
 		;;
20f812
 	ppcle | powerpclittle | ppc-le | powerpc-little)
20f812
 		basic_machine=powerpcle-unknown
20f812
@@ -821,6 +1024,10 @@
20f812
 		basic_machine=i586-unknown
20f812
 		os=-pw32
20f812
 		;;
20f812
+	rdos)
20f812
+		basic_machine=i386-pc
20f812
+		os=-rdos
20f812
+		;;
20f812
 	rom68k)
20f812
 		basic_machine=m68k-rom68k
20f812
 		os=-coff
20f812
@@ -847,6 +1054,10 @@
20f812
 	sb1el)
20f812
 		basic_machine=mipsisa64sb1el-unknown
20f812
 		;;
20f812
+	sde)
20f812
+		basic_machine=mipsisa32-sde
20f812
+		os=-elf
20f812
+		;;
20f812
 	sei)
20f812
 		basic_machine=mips-sei
20f812
 		os=-seiux
20f812
@@ -858,6 +1069,9 @@
20f812
 		basic_machine=sh-hitachi
20f812
 		os=-hms
20f812
 		;;
20f812
+	sh5el)
20f812
+		basic_machine=sh5le-unknown
20f812
+		;;
20f812
 	sh64)
20f812
 		basic_machine=sh64-unknown
20f812
 		;;
20f812
@@ -879,6 +1093,9 @@
20f812
 		basic_machine=i860-stratus
20f812
 		os=-sysv4
20f812
 		;;
20f812
+	strongarm-* | thumb-*)
20f812
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
20f812
+		;;
20f812
 	sun2)
20f812
 		basic_machine=m68000-sun
20f812
 		;;
20f812
@@ -935,17 +1152,9 @@
20f812
 		basic_machine=t90-cray
20f812
 		os=-unicos
20f812
 		;;
20f812
-	tic54x | c54x*)
20f812
-		basic_machine=tic54x-unknown
20f812
-		os=-coff
20f812
-		;;
20f812
-	tic55x | c55x*)
20f812
-		basic_machine=tic55x-unknown
20f812
-		os=-coff
20f812
-		;;
20f812
-	tic6x | c6x*)
20f812
-		basic_machine=tic6x-unknown
20f812
-		os=-coff
20f812
+	tile*)
20f812
+		basic_machine=$basic_machine-unknown
20f812
+		os=-linux-gnu
20f812
 		;;
20f812
 	tx39)
20f812
 		basic_machine=mipstx39-unknown
20f812
@@ -960,6 +1169,10 @@
20f812
 	tower | tower-32)
20f812
 		basic_machine=m68k-ncr
20f812
 		;;
20f812
+	tpf)
20f812
+		basic_machine=s390x-ibm
20f812
+		os=-tpf
20f812
+		;;
20f812
 	udi29k)
20f812
 		basic_machine=a29k-amd
20f812
 		os=-udi
20f812
@@ -1003,9 +1216,16 @@
20f812
 		basic_machine=hppa1.1-winbond
20f812
 		os=-proelf
20f812
 		;;
20f812
+	xbox)
20f812
+		basic_machine=i686-pc
20f812
+		os=-mingw32
20f812
+		;;
20f812
 	xps | xps100)
20f812
 		basic_machine=xps100-honeywell
20f812
 		;;
20f812
+	xscale-* | xscalee[bl]-*)
20f812
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
20f812
+		;;
20f812
 	ymp)
20f812
 		basic_machine=ymp-cray
20f812
 		os=-unicos
20f812
@@ -1014,6 +1234,10 @@
20f812
 		basic_machine=z8k-unknown
20f812
 		os=-sim
20f812
 		;;
20f812
+	z80-*-coff)
20f812
+		basic_machine=z80-unknown
20f812
+		os=-sim
20f812
+		;;
20f812
 	none)
20f812
 		basic_machine=none-none
20f812
 		os=-none
20f812
@@ -1033,6 +1257,9 @@
20f812
 	romp)
20f812
 		basic_machine=romp-ibm
20f812
 		;;
20f812
+	mmix)
20f812
+		basic_machine=mmix-knuth
20f812
+		;;
20f812
 	rs6000)
20f812
 		basic_machine=rs6000-ibm
20f812
 		;;
20f812
@@ -1049,13 +1276,10 @@
20f812
 	we32k)
20f812
 		basic_machine=we32k-att
20f812
 		;;
20f812
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
20f812
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
20f812
 		basic_machine=sh-unknown
20f812
 		;;
20f812
-	sh64)
20f812
-		basic_machine=sh64-unknown
20f812
-		;;
20f812
-	sparc | sparcv9 | sparcv9b)
20f812
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
20f812
 		basic_machine=sparc-sun
20f812
 		;;
20f812
 	cydra)
20f812
@@ -1099,9 +1323,12 @@
20f812
 if [ x"$os" != x"" ]
20f812
 then
20f812
 case $os in
20f812
-        # First match some system type aliases
20f812
-        # that might get confused with valid system types.
20f812
+	# First match some system type aliases
20f812
+	# that might get confused with valid system types.
20f812
 	# -solaris* is a basic system type, with this one exception.
20f812
+	-auroraux)
20f812
+		os=-auroraux
20f812
+		;;
20f812
 	-solaris1 | -solaris1.*)
20f812
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
20f812
 		;;
20f812
@@ -1122,25 +1349,31 @@
20f812
 	# Each alternative MUST END IN A *, to match a version number.
20f812
 	# -sysv* is not here because it comes later, after sysvr4.
20f812
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
20f812
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
20f812
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
20f812
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
20f812
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
20f812
+	      | -sym* | -kopensolaris* \
20f812
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
20f812
-	      | -aos* \
20f812
+	      | -aos* | -aros* \
20f812
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
20f812
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
20f812
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
20f812
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
20f812
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
20f812
+	      | -bitrig* | -openbsd* | -solidbsd* \
20f812
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
20f812
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
20f812
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
20f812
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
20f812
-	      | -chorusos* | -chorusrdb* \
20f812
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
20f812
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
20f812
+	      | -chorusos* | -chorusrdb* | -cegcc* \
20f812
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
20f812
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
20f812
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
20f812
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
20f812
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
20f812
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
20f812
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
20f812
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
20f812
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
20f812
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
20f812
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
20f812
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
20f812
 	# Remember, each alternative MUST END IN *, to match a version number.
20f812
 		;;
20f812
 	-qnx*)
20f812
@@ -1158,12 +1391,15 @@
20f812
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
20f812
 		;;
20f812
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
20f812
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
20f812
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
20f812
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
20f812
 		;;
20f812
 	-mac*)
20f812
 		os=`echo $os | sed -e 's|mac|macos|'`
20f812
 		;;
20f812
+	-linux-dietlibc)
20f812
+		os=-linux-dietlibc
20f812
+		;;
20f812
 	-linux*)
20f812
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
20f812
 		;;
20f812
@@ -1176,6 +1412,9 @@
20f812
 	-opened*)
20f812
 		os=-openedition
20f812
 		;;
20f812
+	-os400*)
20f812
+		os=-os400
20f812
+		;;
20f812
 	-wince*)
20f812
 		os=-wince
20f812
 		;;
20f812
@@ -1197,6 +1436,9 @@
20f812
 	-atheos*)
20f812
 		os=-atheos
20f812
 		;;
20f812
+	-syllable*)
20f812
+		os=-syllable
20f812
+		;;
20f812
 	-386bsd)
20f812
 		os=-bsd
20f812
 		;;
20f812
@@ -1219,6 +1461,9 @@
20f812
 	-sinix*)
20f812
 		os=-sysv4
20f812
 		;;
20f812
+	-tpf*)
20f812
+		os=-tpf
20f812
+		;;
20f812
 	-triton*)
20f812
 		os=-sysv3
20f812
 		;;
20f812
@@ -1255,6 +1500,14 @@
20f812
 	-kaos*)
20f812
 		os=-kaos
20f812
 		;;
20f812
+	-zvmoe)
20f812
+		os=-zvmoe
20f812
+		;;
20f812
+	-dicos*)
20f812
+		os=-dicos
20f812
+		;;
20f812
+	-nacl*)
20f812
+		;;
20f812
 	-none)
20f812
 		;;
20f812
 	*)
20f812
@@ -1277,6 +1530,12 @@
20f812
 # system, and we'll never get to this point.
20f812
 
20f812
 case $basic_machine in
20f812
+	score-*)
20f812
+		os=-elf
20f812
+		;;
20f812
+	spu-*)
20f812
+		os=-elf
20f812
+		;;
20f812
 	*-acorn)
20f812
 		os=-riscix1.2
20f812
 		;;
20f812
@@ -1286,9 +1545,21 @@
20f812
 	arm*-semi)
20f812
 		os=-aout
20f812
 		;;
20f812
-    c4x-* | tic4x-*)
20f812
-        os=-coff
20f812
-        ;;
20f812
+	c4x-* | tic4x-*)
20f812
+		os=-coff
20f812
+		;;
20f812
+	hexagon-*)
20f812
+		os=-elf
20f812
+		;;
20f812
+	tic54x-*)
20f812
+		os=-coff
20f812
+		;;
20f812
+	tic55x-*)
20f812
+		os=-coff
20f812
+		;;
20f812
+	tic6x-*)
20f812
+		os=-coff
20f812
+		;;
20f812
 	# This must come before the *-dec entry.
20f812
 	pdp10-*)
20f812
 		os=-tops20
20f812
@@ -1307,13 +1578,13 @@
20f812
 		;;
20f812
 	m68000-sun)
20f812
 		os=-sunos3
20f812
-		# This also exists in the configure program, but was not the
20f812
-		# default.
20f812
-		# os=-sunos4
20f812
 		;;
20f812
 	m68*-cisco)
20f812
 		os=-aout
20f812
 		;;
20f812
+	mep-*)
20f812
+		os=-elf
20f812
+		;;
20f812
 	mips*-cisco)
20f812
 		os=-elf
20f812
 		;;
20f812
@@ -1332,9 +1603,15 @@
20f812
 	*-be)
20f812
 		os=-beos
20f812
 		;;
20f812
+	*-haiku)
20f812
+		os=-haiku
20f812
+		;;
20f812
 	*-ibm)
20f812
 		os=-aix
20f812
 		;;
20f812
+	*-knuth)
20f812
+		os=-mmixware
20f812
+		;;
20f812
 	*-wec)
20f812
 		os=-proelf
20f812
 		;;
20f812
@@ -1437,7 +1714,7 @@
20f812
 			-sunos*)
20f812
 				vendor=sun
20f812
 				;;
20f812
-			-aix*)
20f812
+			-cnk*|-aix*)
20f812
 				vendor=ibm
20f812
 				;;
20f812
 			-beos*)
20f812
@@ -1467,9 +1744,15 @@
20f812
 			-mvs* | -opened*)
20f812
 				vendor=ibm
20f812
 				;;
20f812
+			-os400*)
20f812
+				vendor=ibm
20f812
+				;;
20f812
 			-ptx*)
20f812
 				vendor=sequent
20f812
 				;;
20f812
+			-tpf*)
20f812
+				vendor=ibm
20f812
+				;;
20f812
 			-vxsim* | -vxworks* | -windiss*)
20f812
 				vendor=wrs
20f812
 				;;
20f812
@@ -1494,7 +1777,7 @@
20f812
 esac
20f812
 
20f812
 echo $basic_machine$os
20f812
-exit 0
20f812
+exit
20f812
 
20f812
 # Local variables:
20f812
 # eval: (add-hook 'write-file-hooks 'time-stamp)