Blame SOURCES/star-1.5.2-aarch64-config.patch

646d41
diff --git a/autoconf/config.guess b/autoconf/config.guess
646d41
index f354fc7..f475ceb 100755
646d41
--- a/autoconf/config.guess
646d41
+++ b/autoconf/config.guess
646d41
@@ -1,12 +1,12 @@
646d41
 #! /bin/sh
646d41
-# @(#)config.guess	1.15 09/10/31 Copyright 1999-2009 J. Schilling
646d41
-#
646d41
 # Attempt to guess a canonical system name.
646d41
-#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
646d41
-#
646d41
+#   Copyright 1992-2013 Free Software Foundation, Inc.
646d41
+
646d41
+timestamp='2013-02-12'
646d41
+
646d41
 # This file is free software; you can redistribute it and/or modify it
646d41
 # under the terms of the GNU General Public License as published by
646d41
-# the Free Software Foundation; either version 2 of the License, or
646d41
+# the Free Software Foundation; either version 3 of the License, or
646d41
 # (at your option) any later version.
646d41
 #
646d41
 # This program is distributed in the hope that it will be useful, but
646d41
@@ -15,170 +15,349 @@
646d41
 # General Public License for more details.
646d41
 #
646d41
 # You should have received a copy of the GNU General Public License
646d41
-# along with this program; if not, write to the Free Software
646d41
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
646d41
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
646d41
 #
646d41
 # As a special exception to the GNU General Public License, if you
646d41
 # distribute this file as part of a program that contains a
646d41
 # configuration script generated by Autoconf, you may include it under
646d41
-# the same distribution terms that you use for the rest of that program.
646d41
-
646d41
-# Written by Per Bothner <bothner@cygnus.com>.
646d41
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
646d41
-#
646d41
-# This script attempts to guess a canonical system name similar to
646d41
-# config.sub.  If it succeeds, it prints the system name on stdout, and
646d41
-# exits with 0.  Otherwise, it exits with 1.
646d41
+# the same distribution terms that you use for the rest of that
646d41
+# program.  This Exception is an additional permission under section 7
646d41
+# of the GNU General Public License, version 3 ("GPLv3").
646d41
 #
646d41
-# The plan is that this can be called by configure scripts if you
646d41
-# don't specify an explicit system type (host/target name).
646d41
+# Originally written by Per Bothner.
646d41
 #
646d41
-# Only a few systems have been added to this list; please add others
646d41
-# (but try to keep the structure clean).
646d41
+# You can get the latest version of this script from:
646d41
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
646d41
 #
646d41
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
646d41
+
646d41
+
646d41
+me=`echo "$0" | sed -e 's,.*/,,'`
646d41
+
646d41
+usage="\
646d41
+Usage: $0 [OPTION]
646d41
+
646d41
+Output the configuration name of the system \`$me' is run on.
646d41
+
646d41
+Operation modes:
646d41
+  -h, --help         print this help, then exit
646d41
+  -t, --time-stamp   print date of last modification, then exit
646d41
+  -v, --version      print version number, then exit
646d41
+
646d41
+Report bugs and patches to <config-patches@gnu.org>."
646d41
+
646d41
+version="\
646d41
+GNU config.guess ($timestamp)
646d41
+
646d41
+Originally written by Per Bothner.
646d41
+Copyright 1992-2013 Free Software Foundation, Inc.
646d41
+
646d41
+This is free software; see the source for copying conditions.  There is NO
646d41
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
646d41
+
646d41
+help="
646d41
+Try \`$me --help' for more information."
646d41
+
646d41
+# Parse command line
646d41
+while test $# -gt 0 ; do
646d41
+  case $1 in
646d41
+    --time-stamp | --time* | -t )
646d41
+       echo "$timestamp" ; exit ;;
646d41
+    --version | -v )
646d41
+       echo "$version" ; exit ;;
646d41
+    --help | --h* | -h )
646d41
+       echo "$usage"; exit ;;
646d41
+    -- )     # Stop option processing
646d41
+       shift; break ;;
646d41
+    - )	# Use stdin as input.
646d41
+       break ;;
646d41
+    -* )
646d41
+       echo "$me: invalid option $1$help" >&2
646d41
+       exit 1 ;;
646d41
+    * )
646d41
+       break ;;
646d41
+  esac
646d41
+done
646d41
+
646d41
+if test $# != 0; then
646d41
+  echo "$me: too many arguments$help" >&2
646d41
+  exit 1
646d41
+fi
646d41
+
646d41
+trap 'exit 1' 1 2 15
646d41
+
646d41
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
646d41
+# compiler to aid in system detection is discouraged as it requires
646d41
+# temporary files to be created and, as you can see below, it is a
646d41
+# headache to deal with in a portable fashion.
646d41
+
646d41
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
646d41
+# use `HOST_CC' if defined, but it is deprecated.
646d41
+
646d41
+# Portable tmp directory creation inspired by the Autoconf team.
646d41
+
646d41
+set_cc_for_build='
646d41
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
646d41
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
646d41
+: ${TMPDIR=/tmp} ;
646d41
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
646d41
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
646d41
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
646d41
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
646d41
+dummy=$tmp/dummy ;
646d41
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
646d41
+case $CC_FOR_BUILD,$HOST_CC,$CC in
646d41
+ ,,)    echo "int x;" > $dummy.c ;
646d41
+	for c in cc gcc c89 c99 ; do
646d41
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
646d41
+	     CC_FOR_BUILD="$c"; break ;
646d41
+	  fi ;
646d41
+	done ;
646d41
+	if test x"$CC_FOR_BUILD" = x ; then
646d41
+	  CC_FOR_BUILD=no_compiler_found ;
646d41
+	fi
646d41
+	;;
646d41
+ ,,*)   CC_FOR_BUILD=$CC ;;
646d41
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
646d41
+esac ; set_cc_for_build= ;'
646d41
 
646d41
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
646d41
-# (ghazi@noc.rutgers.edu 8/24/94.)
646d41
+# (ghazi@noc.rutgers.edu 1994-08-24)
646d41
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
646d41
 	PATH=$PATH:/.attbin ; export PATH
646d41
 fi
646d41
 
646d41
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
646d41
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
646d41
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
646d41
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
646d41
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
646d41
 
646d41
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
646d41
-
646d41
 # Note: order is significant - the case branches are not exclusive.
646d41
 
646d41
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
646d41
+    *:NetBSD:*:*)
646d41
+	# NetBSD (nbsd) targets should (where applicable) match one or
646d41
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
646d41
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
646d41
+	# switched to ELF, *-*-netbsd* would select the old
646d41
+	# object file format.  This provides both forward
646d41
+	# compatibility and a consistent mechanism for selecting the
646d41
+	# object file format.
646d41
+	#
646d41
+	# Note: NetBSD doesn't particularly care about the vendor
646d41
+	# portion of the name.  We always set it to "unknown".
646d41
+	sysctl="sysctl -n hw.machine_arch"
646d41
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
646d41
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
646d41
+	case "${UNAME_MACHINE_ARCH}" in
646d41
+	    armeb) machine=armeb-unknown ;;
646d41
+	    arm*) machine=arm-unknown ;;
646d41
+	    sh3el) machine=shl-unknown ;;
646d41
+	    sh3eb) machine=sh-unknown ;;
646d41
+	    sh5el) machine=sh5le-unknown ;;
646d41
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
646d41
+	esac
646d41
+	# The Operating System including object format, if it has switched
646d41
+	# to ELF recently, or will in the future.
646d41
+	case "${UNAME_MACHINE_ARCH}" in
646d41
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
646d41
+		eval $set_cc_for_build
646d41
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
646d41
+			| grep -q __ELF__
646d41
+		then
646d41
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
646d41
+		    # Return netbsd for either.  FIX?
646d41
+		    os=netbsd
646d41
+		else
646d41
+		    os=netbsdelf
646d41
+		fi
646d41
+		;;
646d41
+	    *)
646d41
+		os=netbsd
646d41
+		;;
646d41
+	esac
646d41
+	# The OS release
646d41
+	# Debian GNU/NetBSD machines have a different userland, and
646d41
+	# thus, need a distinct triplet. However, they do not need
646d41
+	# kernel version information, so it can be replaced with a
646d41
+	# suitable tag, in the style of linux-gnu.
646d41
+	case "${UNAME_VERSION}" in
646d41
+	    Debian*)
646d41
+		release='-gnu'
646d41
+		;;
646d41
+	    *)
646d41
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
646d41
+		;;
646d41
+	esac
646d41
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
646d41
+	# contains redundant information, the shorter form:
646d41
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
646d41
+	echo "${machine}-${os}${release}"
646d41
+	exit ;;
646d41
+    *:Bitrig:*:*)
646d41
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
646d41
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *:OpenBSD:*:*)
646d41
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
646d41
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *:ekkoBSD:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *:SolidBSD:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    macppc:MirBSD:*:*)
646d41
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *:MirBSD:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
646d41
+	exit ;;
646d41
     alpha:OSF1:*:*)
646d41
-	if test $UNAME_RELEASE = "V4.0"; then
646d41
+	case $UNAME_RELEASE in
646d41
+	*4.0)
646d41
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
646d41
-	fi
646d41
+		;;
646d41
+	*5.*)
646d41
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
646d41
+		;;
646d41
+	esac
646d41
+	# According to Compaq, /usr/sbin/psrinfo has been available on
646d41
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
646d41
+	# covers most systems running today.  This code pipes the CPU
646d41
+	# types through head -n 1, so we only detect the type of CPU 0.
646d41
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
646d41
+	case "$ALPHA_CPU_TYPE" in
646d41
+	    "EV4 (21064)")
646d41
+		UNAME_MACHINE="alpha" ;;
646d41
+	    "EV4.5 (21064)")
646d41
+		UNAME_MACHINE="alpha" ;;
646d41
+	    "LCA4 (21066/21068)")
646d41
+		UNAME_MACHINE="alpha" ;;
646d41
+	    "EV5 (21164)")
646d41
+		UNAME_MACHINE="alphaev5" ;;
646d41
+	    "EV5.6 (21164A)")
646d41
+		UNAME_MACHINE="alphaev56" ;;
646d41
+	    "EV5.6 (21164PC)")
646d41
+		UNAME_MACHINE="alphapca56" ;;
646d41
+	    "EV5.7 (21164PC)")
646d41
+		UNAME_MACHINE="alphapca57" ;;
646d41
+	    "EV6 (21264)")
646d41
+		UNAME_MACHINE="alphaev6" ;;
646d41
+	    "EV6.7 (21264A)")
646d41
+		UNAME_MACHINE="alphaev67" ;;
646d41
+	    "EV6.8CB (21264C)")
646d41
+		UNAME_MACHINE="alphaev68" ;;
646d41
+	    "EV6.8AL (21264B)")
646d41
+		UNAME_MACHINE="alphaev68" ;;
646d41
+	    "EV6.8CX (21264D)")
646d41
+		UNAME_MACHINE="alphaev68" ;;
646d41
+	    "EV6.9A (21264/EV69A)")
646d41
+		UNAME_MACHINE="alphaev69" ;;
646d41
+	    "EV7 (21364)")
646d41
+		UNAME_MACHINE="alphaev7" ;;
646d41
+	    "EV7.9 (21364A)")
646d41
+		UNAME_MACHINE="alphaev79" ;;
646d41
+	esac
646d41
+	# A Pn.n version is a patched version.
646d41
 	# A Vn.n version is a released version.
646d41
 	# A Tn.n version is a released field test version.
646d41
 	# A Xn.n version is an unreleased experimental baselevel.
646d41
 	# 1.2 uses "1.2" for uname -r.
646d41
-	cat <<EOF >dummy.s
646d41
-	.globl main
646d41
-	.ent main
646d41
-main:
646d41
-	.frame \$30,0,\$26,0
646d41
-	.prologue 0
646d41
-	.long 0x47e03d80 # implver $0
646d41
-	lda \$2,259
646d41
-	.long 0x47e20c21 # amask $2,$1
646d41
-	srl \$1,8,\$2
646d41
-	sll \$2,2,\$2
646d41
-	sll \$0,3,\$0
646d41
-	addl \$1,\$0,\$0
646d41
-	addl \$2,\$0,\$0
646d41
-	ret \$31,(\$26),1
646d41
-	.end main
646d41
-EOF
646d41
-	${CC-cc} dummy.s -o dummy 2>/dev/null
646d41
-	if test "$?" = 0 ; then
646d41
-		./dummy
646d41
-		case "$?" in
646d41
-			7)
646d41
-				UNAME_MACHINE="alpha"
646d41
-				;;
646d41
-			15)
646d41
-				UNAME_MACHINE="alphaev5"
646d41
-				;;
646d41
-			14)
646d41
-				UNAME_MACHINE="alphaev56"
646d41
-				;;
646d41
-			10)
646d41
-				UNAME_MACHINE="alphapca56"
646d41
-				;;
646d41
-			16)
646d41
-				UNAME_MACHINE="alphaev6"
646d41
-				;;
646d41
-		esac
646d41
-	fi
646d41
-	rm -f dummy.s dummy
646d41
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
646d41
-	exit 0 ;;
646d41
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
646d41
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
646d41
+	exitcode=$?
646d41
+	trap '' 0
646d41
+	exit $exitcode ;;
646d41
+    Alpha\ *:Windows_NT*:*)
646d41
+	# How do we know it's Interix rather than the generic POSIX subsystem?
646d41
+	# Should we change UNAME_MACHINE based on the output of uname instead
646d41
+	# of the specific Alpha model?
646d41
+	echo alpha-pc-interix
646d41
+	exit ;;
646d41
     21064:Windows_NT:50:3)
646d41
 	echo alpha-dec-winnt3.5
646d41
-	exit 0 ;;
646d41
-    *:FreeMiNT:*:*)
646d41
-	echo m68k-atari-freemint
646d41
-	exit 0 ;;
646d41
-    *:MiNT:*:*)
646d41
-	echo m68k-atari-mint
646d41
-	exit 0 ;;
646d41
-    *:TOS:*:*)
646d41
-	echo m68k-atari-tos
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     Amiga*:UNIX_System_V:4.0:*)
646d41
-	echo m68k-cbm-sysv4
646d41
-	exit 0;;
646d41
-    amiga:NetBSD:*:*)
646d41
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
646d41
-      exit 0 ;;
646d41
-    amiga:OpenBSD:*:*)
646d41
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	echo m68k-unknown-sysv4
646d41
+	exit ;;
646d41
     *:[Aa]miga[Oo][Ss]:*:*)
646d41
 	echo ${UNAME_MACHINE}-unknown-amigaos
646d41
-	exit 0 ;;
646d41
-    arc64:OpenBSD:*:*)
646d41
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    arc:OpenBSD:*:*)
646d41
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    hkmips:OpenBSD:*:*)
646d41
-	echo mips-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    pmax:OpenBSD:*:*)
646d41
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    sgi:OpenBSD:*:*)
646d41
-	echo mips-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    wgrisc:OpenBSD:*:*)
646d41
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    *:[Mm]orph[Oo][Ss]:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-morphos
646d41
+	exit ;;
646d41
+    *:OS/390:*:*)
646d41
+	echo i370-ibm-openedition
646d41
+	exit ;;
646d41
+    *:z/VM:*:*)
646d41
+	echo s390-ibm-zvmoe
646d41
+	exit ;;
646d41
+    *:OS400:*:*)
646d41
+	echo powerpc-ibm-os400
646d41
+	exit ;;
646d41
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
646d41
 	echo arm-acorn-riscix${UNAME_RELEASE}
646d41
-	exit 0;;
646d41
-    arm32:NetBSD:*:*)
646d41
-	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
646d41
-	exit 0 ;;
646d41
-    SR2?01:HI-UX/MPP:*:*)
646d41
+	exit ;;
646d41
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
646d41
+	echo arm-unknown-riscos
646d41
+	exit ;;
646d41
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
646d41
 	echo hppa1.1-hitachi-hiuxmpp
646d41
-	exit 0;;
646d41
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
646d41
+	exit ;;
646d41
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
646d41
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
646d41
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
646d41
 		echo pyramid-pyramid-sysv3
646d41
 	else
646d41
 		echo pyramid-pyramid-bsd
646d41
 	fi
646d41
-	exit 0 ;;
646d41
-    NILE:*:*:dcosx)
646d41
+	exit ;;
646d41
+    NILE*:*:*:dcosx)
646d41
 	echo pyramid-pyramid-svr4
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    DRS?6000:unix:4.0:6*)
646d41
+	echo sparc-icl-nx6
646d41
+	exit ;;
646d41
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
646d41
+	case `/usr/bin/uname -p` in
646d41
+	    sparc) echo sparc-icl-nx7; exit ;;
646d41
+	esac ;;
646d41
+    s390x:SunOS:*:*)
646d41
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
646d41
+	exit ;;
646d41
     sun4H:SunOS:5.*:*)
646d41
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
646d41
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
646d41
-	exit 0 ;;
646d41
-    i86pc:SunOS:5.*:*)
646d41
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
646d41
+	echo i386-pc-auroraux${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
646d41
+	eval $set_cc_for_build
646d41
+	SUN_ARCH="i386"
646d41
+	# If there is a compiler, see if it is configured for 64-bit objects.
646d41
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
646d41
+	# This test works for both compilers.
646d41
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
646d41
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
646d41
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
646d41
+		grep IS_64BIT_ARCH >/dev/null
646d41
+	    then
646d41
+		SUN_ARCH="x86_64"
646d41
+	    fi
646d41
+	fi
646d41
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
646d41
+	exit ;;
646d41
     sun4*:SunOS:6*:*)
646d41
 	# According to config.sub, this is the proper way to canonicalize
646d41
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
646d41
 	# it's likely to be more like Solaris than SunOS4.
646d41
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     sun4*:SunOS:*:*)
646d41
 	case "`/usr/bin/arch -k`" in
646d41
 	    Series*|S4*)
646d41
@@ -187,12 +366,12 @@ EOF
646d41
 	esac
646d41
 	# Japanese Language versions have a version number like `4.1.3-JL'.
646d41
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     sun3*:SunOS:*:*)
646d41
 	echo m68k-sun-sunos${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     sun*:*:4.2BSD:*)
646d41
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
646d41
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
646d41
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
646d41
 	case "`/bin/arch`" in
646d41
 	    sun3)
646d41
@@ -202,55 +381,63 @@ EOF
646d41
 		echo sparc-sun-sunos${UNAME_RELEASE}
646d41
 		;;
646d41
 	esac
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     aushp:SunOS:*:*)
646d41
 	echo sparc-auspex-sunos${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    atari*:NetBSD:*:*)
646d41
-	echo m68k-atari-netbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    atari*:OpenBSD:*:*)
646d41
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    sun3*:NetBSD:*:*)
646d41
-	echo m68k-sun-netbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    sun3*:OpenBSD:*:*)
646d41
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    mac68k:NetBSD:*:*)
646d41
-	echo m68k-apple-netbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    mac68k:OpenBSD:*:*)
646d41
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    mvme68k:OpenBSD:*:*)
646d41
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    mvme88k:OpenBSD:*:*)
646d41
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    # The situation for MiNT is a little confusing.  The machine name
646d41
+    # can be virtually everything (everything which is not
646d41
+    # "atarist" or "atariste" at least should have a processor
646d41
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
646d41
+    # to the lowercase version "mint" (or "freemint").  Finally
646d41
+    # the system name "TOS" denotes a system which is actually not
646d41
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
646d41
+    # be no problem.
646d41
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
646d41
+	echo m68k-atari-mint${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
646d41
+	echo m68k-atari-mint${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
646d41
+	echo m68k-atari-mint${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
646d41
+	echo m68k-milan-mint${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
646d41
+	echo m68k-hades-mint${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
646d41
+	echo m68k-unknown-mint${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    m68k:machten:*:*)
646d41
+	echo m68k-apple-machten${UNAME_RELEASE}
646d41
+	exit ;;
646d41
     powerpc:machten:*:*)
646d41
 	echo powerpc-apple-machten${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    macppc:NetBSD:*:*)
646d41
-        echo powerpc-apple-netbsd${UNAME_RELEASE}
646d41
-        exit 0 ;;
646d41
+	exit ;;
646d41
     RISC*:Mach:*:*)
646d41
 	echo mips-dec-mach_bsd4.3
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     RISC*:ULTRIX:*:*)
646d41
 	echo mips-dec-ultrix${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     VAX*:ULTRIX*:*:*)
646d41
 	echo vax-dec-ultrix${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    2020:CLIX:*:*)
646d41
+	exit ;;
646d41
+    2020:CLIX:*:* | 2430:CLIX:*:*)
646d41
 	echo clipper-intergraph-clix${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     mips:*:*:UMIPS | mips:*:*:RISCos)
646d41
-	sed 's/^	//' << EOF >dummy.c
646d41
-	int main (argc, argv) int argc; char **argv; {
646d41
+	eval $set_cc_for_build
646d41
+	sed 's/^	//' << EOF >$dummy.c
646d41
+#ifdef __cplusplus
646d41
+#include <stdio.h>  /* for printf() prototype */
646d41
+	int main (int argc, char *argv[]) {
646d41
+#else
646d41
+	int main (argc, argv) int argc; char *argv[]; {
646d41
+#endif
646d41
 	#if defined (host_mips) && defined (MIPSEB)
646d41
 	#if defined (SYSTYPE_SYSV)
646d41
 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
646d41
@@ -265,62 +452,83 @@ EOF
646d41
 	  exit (-1);
646d41
 	}
646d41
 EOF
646d41
-	${CC-cc} dummy.c -o dummy \
646d41
-	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
646d41
-	  && rm dummy.c dummy && exit 0
646d41
-	rm -f dummy.c dummy
646d41
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
646d41
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
646d41
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
646d41
+	    { echo "$SYSTEM_NAME"; exit; }
646d41
 	echo mips-mips-riscos${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    Motorola:PowerMAX_OS:*:*)
646d41
+	echo powerpc-motorola-powermax
646d41
+	exit ;;
646d41
+    Motorola:*:4.3:PL8-*)
646d41
+	echo powerpc-harris-powermax
646d41
+	exit ;;
646d41
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
646d41
+	echo powerpc-harris-powermax
646d41
+	exit ;;
646d41
     Night_Hawk:Power_UNIX:*:*)
646d41
 	echo powerpc-harris-powerunix
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     m88k:CX/UX:7*:*)
646d41
 	echo m88k-harris-cxux7
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     m88k:*:4*:R4*)
646d41
 	echo m88k-motorola-sysv4
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     m88k:*:3*:R3*)
646d41
 	echo m88k-motorola-sysv3
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     AViiON:dgux:*:*)
646d41
-        # DG/UX returns AViiON for all architectures
646d41
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
646d41
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
646d41
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
646d41
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
646d41
+	# DG/UX returns AViiON for all architectures
646d41
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
646d41
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
646d41
+	then
646d41
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
646d41
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
646d41
+	    then
646d41
 		echo m88k-dg-dgux${UNAME_RELEASE}
646d41
-	else
646d41
+	    else
646d41
 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
646d41
+	    fi
646d41
+	else
646d41
+	    echo i586-dg-dgux${UNAME_RELEASE}
646d41
 	fi
646d41
-        else echo i586-dg-dgux${UNAME_RELEASE}
646d41
-        fi
646d41
- 	exit 0 ;;
646d41
+	exit ;;
646d41
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
646d41
 	echo m88k-dolphin-sysv3
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     M88*:*:R3*:*)
646d41
 	# Delta 88k system running SVR3
646d41
 	echo m88k-motorola-sysv3
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
646d41
 	echo m88k-tektronix-sysv3
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
646d41
 	echo m68k-tektronix-bsd
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     *:IRIX*:*:*)
646d41
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
646d41
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
646d41
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
646d41
-    i?86:AIX:*:*)
646d41
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
646d41
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
646d41
+    i*86:AIX:*:*)
646d41
 	echo i386-ibm-aix
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    ia64:AIX:*:*)
646d41
+	if [ -x /usr/bin/oslevel ] ; then
646d41
+		IBM_REV=`/usr/bin/oslevel`
646d41
+	else
646d41
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
646d41
+	fi
646d41
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
646d41
+	exit ;;
646d41
     *:AIX:2:3)
646d41
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
646d41
-		sed 's/^		//' << EOF >dummy.c
646d41
+		eval $set_cc_for_build
646d41
+		sed 's/^		//' << EOF >$dummy.c
646d41
 		#include <sys/systemcfg.h>
646d41
 
646d41
 		main()
646d41
@@ -331,18 +539,21 @@ EOF
646d41
 			exit(0);
646d41
 			}
646d41
 EOF
646d41
-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
646d41
-		rm -f dummy.c dummy
646d41
-		echo rs6000-ibm-aix3.2.5
646d41
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
646d41
+		then
646d41
+			echo "$SYSTEM_NAME"
646d41
+		else
646d41
+			echo rs6000-ibm-aix3.2.5
646d41
+		fi
646d41
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
646d41
 		echo rs6000-ibm-aix3.2.4
646d41
 	else
646d41
 		echo rs6000-ibm-aix3.2
646d41
 	fi
646d41
-	exit 0 ;;
646d41
-    *:AIX:*:4)
646d41
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
646d41
-	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
646d41
+	exit ;;
646d41
+    *:AIX:*:[4567])
646d41
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
646d41
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
646d41
 		IBM_ARCH=rs6000
646d41
 	else
646d41
 		IBM_ARCH=powerpc
646d41
@@ -350,75 +561,120 @@ EOF
646d41
 	if [ -x /usr/bin/oslevel ] ; then
646d41
 		IBM_REV=`/usr/bin/oslevel`
646d41
 	else
646d41
-		IBM_REV=4.${UNAME_RELEASE}
646d41
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
646d41
 	fi
646d41
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     *:AIX:*:*)
646d41
 	echo rs6000-ibm-aix
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
646d41
 	echo romp-ibm-bsd4.4
646d41
-	exit 0 ;;
646d41
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
646d41
+	exit ;;
646d41
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
646d41
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
646d41
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
646d41
+	exit ;;                             # report: romp-ibm BSD 4.3
646d41
     *:BOSX:*:*)
646d41
 	echo rs6000-bull-bosx
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     DPX/2?00:B.O.S.:*:*)
646d41
 	echo m68k-bull-sysv3
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     9000/[34]??:4.3bsd:1.*:*)
646d41
 	echo m68k-hp-bsd
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
646d41
 	echo m68k-hp-bsd4.4
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     9000/[34678]??:HP-UX:*:*)
646d41
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
646d41
 	case "${UNAME_MACHINE}" in
646d41
 	    9000/31? )            HP_ARCH=m68000 ;;
646d41
 	    9000/[34]?? )         HP_ARCH=m68k ;;
646d41
-	    9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 | 9000/820 | 9000/800 )
646d41
-              sed 's/^              //' << EOF >dummy.c
646d41
-              #include <stdlib.h>
646d41
-              #include <unistd.h>
646d41
-              
646d41
-              int main ()
646d41
-              {
646d41
-              #if defined(_SC_KERNEL_BITS)
646d41
-                  long bits = sysconf(_SC_KERNEL_BITS);
646d41
-              #endif 
646d41
-                  long cpu  = sysconf (_SC_CPU_VERSION);
646d41
-              
646d41
-                  switch (cpu) 
646d41
-              	{
646d41
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
646d41
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
646d41
-              	case CPU_PA_RISC2_0: 
646d41
-              #if defined(_SC_KERNEL_BITS)
646d41
-              	    switch (bits) 
646d41
-              		{
646d41
-              		case 64: puts ("hppa2.0w"); break;
646d41
-              		case 32: puts ("hppa2.0n"); break;
646d41
-              		default: puts ("hppa2.0"); break;
646d41
-              		} break;
646d41
-              #else  /* !defined(_SC_KERNEL_BITS) */
646d41
-              	    puts ("hppa2.0"); break;
646d41
-              #endif 
646d41
-              	default: puts ("hppa1.0"); break;
646d41
-              	}
646d41
-                  exit (0);
646d41
-              }
646d41
+	    9000/[678][0-9][0-9])
646d41
+		if [ -x /usr/bin/getconf ]; then
646d41
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
646d41
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
646d41
+		    case "${sc_cpu_version}" in
646d41
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
646d41
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
646d41
+		      532)                      # CPU_PA_RISC2_0
646d41
+			case "${sc_kernel_bits}" in
646d41
+			  32) HP_ARCH="hppa2.0n" ;;
646d41
+			  64) HP_ARCH="hppa2.0w" ;;
646d41
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
646d41
+			esac ;;
646d41
+		    esac
646d41
+		fi
646d41
+		if [ "${HP_ARCH}" = "" ]; then
646d41
+		    eval $set_cc_for_build
646d41
+		    sed 's/^		//' << EOF >$dummy.c
646d41
+
646d41
+		#define _HPUX_SOURCE
646d41
+		#include <stdlib.h>
646d41
+		#include <unistd.h>
646d41
+
646d41
+		int main ()
646d41
+		{
646d41
+		#if defined(_SC_KERNEL_BITS)
646d41
+		    long bits = sysconf(_SC_KERNEL_BITS);
646d41
+		#endif
646d41
+		    long cpu  = sysconf (_SC_CPU_VERSION);
646d41
+
646d41
+		    switch (cpu)
646d41
+			{
646d41
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
646d41
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
646d41
+			case CPU_PA_RISC2_0:
646d41
+		#if defined(_SC_KERNEL_BITS)
646d41
+			    switch (bits)
646d41
+				{
646d41
+				case 64: puts ("hppa2.0w"); break;
646d41
+				case 32: puts ("hppa2.0n"); break;
646d41
+				default: puts ("hppa2.0"); break;
646d41
+				} break;
646d41
+		#else  /* !defined(_SC_KERNEL_BITS) */
646d41
+			    puts ("hppa2.0"); break;
646d41
+		#endif
646d41
+			default: puts ("hppa1.0"); break;
646d41
+			}
646d41
+		    exit (0);
646d41
+		}
646d41
 EOF
646d41
-	(${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
646d41
-	rm -f dummy.c dummy
646d41
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
646d41
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
646d41
+		fi ;;
646d41
 	esac
646d41
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
646d41
+	if [ ${HP_ARCH} = "hppa2.0w" ]
646d41
+	then
646d41
+	    eval $set_cc_for_build
646d41
+
646d41
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
646d41
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
646d41
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
646d41
+	    #
646d41
+	    # $ CC_FOR_BUILD=cc ./config.guess
646d41
+	    # => hppa2.0w-hp-hpux11.23
646d41
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
646d41
+	    # => hppa64-hp-hpux11.23
646d41
+
646d41
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
646d41
+		grep -q __LP64__
646d41
+	    then
646d41
+		HP_ARCH="hppa2.0w"
646d41
+	    else
646d41
+		HP_ARCH="hppa64"
646d41
+	    fi
646d41
+	fi
646d41
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    ia64:HP-UX:*:*)
646d41
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
646d41
+	echo ia64-hp-hpux${HPUX_REV}
646d41
+	exit ;;
646d41
     3050*:HI-UX:*:*)
646d41
-	sed 's/^	//' << EOF >dummy.c
646d41
+	eval $set_cc_for_build
646d41
+	sed 's/^	//' << EOF >$dummy.c
646d41
 	#include <unistd.h>
646d41
 	int
646d41
 	main ()
646d41
@@ -443,357 +699,458 @@ EOF
646d41
 	  exit (0);
646d41
 	}
646d41
 EOF
646d41
-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
646d41
-	rm -f dummy.c dummy
646d41
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
646d41
+		{ echo "$SYSTEM_NAME"; exit; }
646d41
 	echo unknown-hitachi-hiuxwe2
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
646d41
 	echo hppa1.1-hp-bsd
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     9000/8??:4.3bsd:*:*)
646d41
 	echo hppa1.0-hp-bsd
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
646d41
+	echo hppa1.0-hp-mpeix
646d41
+	exit ;;
646d41
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
646d41
 	echo hppa1.1-hp-osf
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     hp8??:OSF1:*:*)
646d41
 	echo hppa1.0-hp-osf
646d41
-	exit 0 ;;
646d41
-    i?86:OSF1:*:*)
646d41
+	exit ;;
646d41
+    i*86:OSF1:*:*)
646d41
 	if [ -x /usr/sbin/sysversion ] ; then
646d41
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
646d41
 	else
646d41
 	    echo ${UNAME_MACHINE}-unknown-osf1
646d41
 	fi
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     parisc*:Lites*:*:*)
646d41
 	echo hppa1.1-hp-lites
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
646d41
 	echo c1-convex-bsd
646d41
-        exit 0 ;;
646d41
+	exit ;;
646d41
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
646d41
 	if getsysinfo -f scalar_acc
646d41
 	then echo c32-convex-bsd
646d41
 	else echo c2-convex-bsd
646d41
 	fi
646d41
-        exit 0 ;;
646d41
+	exit ;;
646d41
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
646d41
 	echo c34-convex-bsd
646d41
-        exit 0 ;;
646d41
+	exit ;;
646d41
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
646d41
 	echo c38-convex-bsd
646d41
-        exit 0 ;;
646d41
+	exit ;;
646d41
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
646d41
 	echo c4-convex-bsd
646d41
-        exit 0 ;;
646d41
-    CRAY*X-MP:*:*:*)
646d41
-	echo xmp-cray-unicos
646d41
-        exit 0 ;;
646d41
+	exit ;;
646d41
     CRAY*Y-MP:*:*:*)
646d41
-	echo ymp-cray-unicos${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
646d41
+	exit ;;
646d41
     CRAY*[A-Z]90:*:*:*)
646d41
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
646d41
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
646d41
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
646d41
-	exit 0 ;;
646d41
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
646d41
+	      -e 's/\.[^.]*$/.X/'
646d41
+	exit ;;
646d41
     CRAY*TS:*:*:*)
646d41
-	echo t90-cray-unicos${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    CRAY-2:*:*:*)
646d41
-	echo cray2-cray-unicos
646d41
-        exit 0 ;;
646d41
-    F300:UNIX_System_V:*:*)
646d41
-        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
646d41
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
646d41
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
646d41
-        exit 0 ;;
646d41
-    F301:UNIX_System_V:*:*)
646d41
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
646d41
-       exit 0 ;;
646d41
-    hp3[0-9][05]:NetBSD:*:*)
646d41
-	echo m68k-hp-netbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    hp300:OpenBSD:*:*)
646d41
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
646d41
+	exit ;;
646d41
+    CRAY*T3E:*:*:*)
646d41
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
646d41
+	exit ;;
646d41
+    CRAY*SV1:*:*:*)
646d41
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
646d41
+	exit ;;
646d41
+    *:UNICOS/mp:*:*)
646d41
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
646d41
+	exit ;;
646d41
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
646d41
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
646d41
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
646d41
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
646d41
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
646d41
+	exit ;;
646d41
+    5000:UNIX_System_V:4.*:*)
646d41
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
646d41
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
646d41
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
646d41
+	exit ;;
646d41
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
646d41
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
646d41
+	exit ;;
646d41
     sparc*:BSD/OS:*:*)
646d41
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
646d41
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    *:BSD/OS:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
646d41
+	exit ;;
646d41
     *:FreeBSD:*:*)
646d41
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
646d41
-	exit 0 ;;
646d41
-    *:DragonFly:*:*)
646d41
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
646d41
-	exit 0 ;;
646d41
-    *:NetBSD:*:*)
646d41
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
646d41
-	exit 0 ;;
646d41
-    *:OpenBSD:*:*)
646d41
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
646d41
-	exit 0 ;;
646d41
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
646d41
+	case ${UNAME_PROCESSOR} in
646d41
+	    amd64)
646d41
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
646d41
+	    *)
646d41
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
646d41
+	esac
646d41
+	exit ;;
646d41
     i*:CYGWIN*:*)
646d41
 	echo ${UNAME_MACHINE}-pc-cygwin
646d41
-	exit 0 ;;
646d41
-    i*:MINGW*:*)
646d41
+	exit ;;
646d41
+    *:MINGW64*:*)
646d41
+	echo ${UNAME_MACHINE}-pc-mingw64
646d41
+	exit ;;
646d41
+    *:MINGW*:*)
646d41
 	echo ${UNAME_MACHINE}-pc-mingw32
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    i*:MSYS*:*)
646d41
+	echo ${UNAME_MACHINE}-pc-msys
646d41
+	exit ;;
646d41
+    i*:windows32*:*)
646d41
+	# uname -m includes "-pc" on this system.
646d41
+	echo ${UNAME_MACHINE}-mingw32
646d41
+	exit ;;
646d41
+    i*:PW*:*)
646d41
+	echo ${UNAME_MACHINE}-pc-pw32
646d41
+	exit ;;
646d41
+    *:Interix*:*)
646d41
+	case ${UNAME_MACHINE} in
646d41
+	    x86)
646d41
+		echo i586-pc-interix${UNAME_RELEASE}
646d41
+		exit ;;
646d41
+	    authenticamd | genuineintel | EM64T)
646d41
+		echo x86_64-unknown-interix${UNAME_RELEASE}
646d41
+		exit ;;
646d41
+	    IA64)
646d41
+		echo ia64-unknown-interix${UNAME_RELEASE}
646d41
+		exit ;;
646d41
+	esac ;;
646d41
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
646d41
+	echo i${UNAME_MACHINE}-pc-mks
646d41
+	exit ;;
646d41
+    8664:Windows_NT:*)
646d41
+	echo x86_64-pc-mks
646d41
+	exit ;;
646d41
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
646d41
+	# How do we know it's Interix rather than the generic POSIX subsystem?
646d41
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
646d41
+	# UNAME_MACHINE based on the output of uname instead of i386?
646d41
+	echo i586-pc-interix
646d41
+	exit ;;
646d41
+    i*:UWIN*:*)
646d41
+	echo ${UNAME_MACHINE}-pc-uwin
646d41
+	exit ;;
646d41
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
646d41
+	echo x86_64-unknown-cygwin
646d41
+	exit ;;
646d41
     p*:CYGWIN*:*)
646d41
 	echo powerpcle-unknown-cygwin
646d41
-	exit 0 ;;
646d41
-    x86:Interix*:3*)
646d41
-	echo i586-pc-interix3
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     prep*:SunOS:5.*:*)
646d41
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     *:GNU:*:*)
646d41
+	# the GNU system
646d41
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
646d41
-	exit 0 ;;
646d41
-    s390:Linux:*:* | s390x:Linux:*:*)
646d41
-	echo ${UNAME_MACHINE}-ibm-linux
646d41
-	exit 0 ;;
646d41
-    *:Linux:*:*)
646d41
-	# uname on the ARM produces all sorts of strangeness, and we need to
646d41
-	# filter it out.
646d41
-	case "$UNAME_MACHINE" in
646d41
-	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
646d41
-	esac
646d41
-
646d41
-	# The BFD linker knows what the default object file format is, so
646d41
-	# first see if it will tell us.
646d41
-	ld_help_string=`ld --help 2>&1`
646d41
-	ld_supported_emulations=`echo $ld_help_string \
646d41
-			 | sed -ne '/supported emulations:/!d
646d41
-				    s/[ 	][ 	]*/ /g
646d41
-				    s/.*supported emulations: *//
646d41
-				    s/ .*//
646d41
-				    p'`
646d41
-        case "$ld_supported_emulations" in
646d41
-	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
646d41
-	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
646d41
-	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
646d41
-	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
646d41
-	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
646d41
-	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
646d41
+	exit ;;
646d41
+    *:GNU/*:*:*)
646d41
+	# other systems with GNU libc and userland
646d41
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
646d41
+	exit ;;
646d41
+    i*86:Minix:*:*)
646d41
+	echo ${UNAME_MACHINE}-pc-minix
646d41
+	exit ;;
646d41
+    aarch64:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    aarch64_be:Linux:*:*)
646d41
+	UNAME_MACHINE=aarch64_be
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    alpha:Linux:*:*)
646d41
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
646d41
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
646d41
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
646d41
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
646d41
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
646d41
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
646d41
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
646d41
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
646d41
 	esac
646d41
-
646d41
-	if test "${UNAME_MACHINE}" = "alpha" ; then
646d41
-		sed 's/^	//'  <<EOF >dummy.s
646d41
-		.globl main
646d41
-		.ent main
646d41
-	main:
646d41
-		.frame \$30,0,\$26,0
646d41
-		.prologue 0
646d41
-		.long 0x47e03d80 # implver $0
646d41
-		lda \$2,259
646d41
-		.long 0x47e20c21 # amask $2,$1
646d41
-		srl \$1,8,\$2
646d41
-		sll \$2,2,\$2
646d41
-		sll \$0,3,\$0
646d41
-		addl \$1,\$0,\$0
646d41
-		addl \$2,\$0,\$0
646d41
-		ret \$31,(\$26),1
646d41
-		.end main
646d41
-EOF
646d41
-		LIBC=""
646d41
-		${CC-cc} dummy.s -o dummy 2>/dev/null
646d41
-		if test "$?" = 0 ; then
646d41
-			./dummy
646d41
-			case "$?" in
646d41
-			7)
646d41
-				UNAME_MACHINE="alpha"
646d41
-				;;
646d41
-			15)
646d41
-				UNAME_MACHINE="alphaev5"
646d41
-				;;
646d41
-			14)
646d41
-				UNAME_MACHINE="alphaev56"
646d41
-				;;
646d41
-			10)
646d41
-				UNAME_MACHINE="alphapca56"
646d41
-				;;
646d41
-			16)
646d41
-				UNAME_MACHINE="alphaev6"
646d41
-				;;
646d41
-			esac	
646d41
-
646d41
-			objdump --private-headers dummy | \
646d41
-			  grep ld.so.1 > /dev/null
646d41
-			if test "$?" = 0 ; then
646d41
-				LIBC="libc1"
646d41
-			fi
646d41
-		fi	
646d41
-		rm -f dummy.s dummy
646d41
-		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
646d41
-	elif test "${UNAME_MACHINE}" = "mips" ; then
646d41
-	  cat >dummy.c <
646d41
-main(argc, argv)
646d41
-     int argc;
646d41
-     char *argv[];
646d41
-{
646d41
-#ifdef __MIPSEB__
646d41
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
646d41
-#endif
646d41
-#ifdef __MIPSEL__
646d41
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
646d41
-#endif
646d41
-  return 0;
646d41
-}
646d41
-EOF
646d41
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
646d41
-	  rm -f dummy.c dummy
646d41
+	objdump --private-headers /bin/sh | grep -q ld.so.1
646d41
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
646d41
+	exit ;;
646d41
+    arm*:Linux:*:*)
646d41
+	eval $set_cc_for_build
646d41
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
646d41
+	    | grep -q __ARM_EABI__
646d41
+	then
646d41
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
 	else
646d41
-	  # Either a pre-BFD a.out linker (linux-gnuoldld)
646d41
-	  # or one that does not give us useful --help.
646d41
-	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
646d41
-	  # If ld does not provide *any* "supported emulations:"
646d41
-	  # that means it is gnuoldld.
646d41
-	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
646d41
-	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
646d41
-
646d41
-	  case "${UNAME_MACHINE}" in
646d41
-	  i?86)
646d41
-	    VENDOR=pc;
646d41
-	    ;;
646d41
-	  *)
646d41
-	    VENDOR=unknown;
646d41
-	    ;;
646d41
-	  esac
646d41
-	  # Determine whether the default compiler is a.out or elf
646d41
-	  cat >dummy.c <
646d41
-#include <features.h>
646d41
-main(argc, argv)
646d41
-     int argc;
646d41
-     char *argv[];
646d41
-{
646d41
-#if defined __ELF__ || defined __SUNPRO_C
646d41
-# ifdef __GLIBC__
646d41
-#  if __GLIBC__ >= 2
646d41
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
646d41
-#  else
646d41
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
646d41
-#  endif
646d41
-# else
646d41
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
646d41
-# endif
646d41
-#else
646d41
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
646d41
-#endif
646d41
-  return 0;
646d41
-}
646d41
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
646d41
+		| grep -q __ARM_PCS_VFP
646d41
+	    then
646d41
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
646d41
+	    else
646d41
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
646d41
+	    fi
646d41
+	fi
646d41
+	exit ;;
646d41
+    avr32*:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    cris:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-axis-linux-gnu
646d41
+	exit ;;
646d41
+    crisv32:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-axis-linux-gnu
646d41
+	exit ;;
646d41
+    frv:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    hexagon:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    i*86:Linux:*:*)
646d41
+	LIBC=gnu
646d41
+	eval $set_cc_for_build
646d41
+	sed 's/^	//' << EOF >$dummy.c
646d41
+	#ifdef __dietlibc__
646d41
+	LIBC=dietlibc
646d41
+	#endif
646d41
+EOF
646d41
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
646d41
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
646d41
+	exit ;;
646d41
+    ia64:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    m32r*:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    m68*:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    mips:Linux:*:* | mips64:Linux:*:*)
646d41
+	eval $set_cc_for_build
646d41
+	sed 's/^	//' << EOF >$dummy.c
646d41
+	#undef CPU
646d41
+	#undef ${UNAME_MACHINE}
646d41
+	#undef ${UNAME_MACHINE}el
646d41
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
646d41
+	CPU=${UNAME_MACHINE}el
646d41
+	#else
646d41
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
646d41
+	CPU=${UNAME_MACHINE}
646d41
+	#else
646d41
+	CPU=
646d41
+	#endif
646d41
+	#endif
646d41
 EOF
646d41
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
646d41
-	  rm -f dummy.c dummy
646d41
-	fi ;;
646d41
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
646d41
-# are messed up and put the nodename in both sysname and nodename.
646d41
-    i?86:DYNIX/ptx:4*:*)
646d41
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
646d41
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
646d41
+	;;
646d41
+    or1k:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    or32:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    padre:Linux:*:*)
646d41
+	echo sparc-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
646d41
+	echo hppa64-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    parisc:Linux:*:* | hppa:Linux:*:*)
646d41
+	# Look for CPU level
646d41
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
646d41
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
646d41
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
646d41
+	  *)    echo hppa-unknown-linux-gnu ;;
646d41
+	esac
646d41
+	exit ;;
646d41
+    ppc64:Linux:*:*)
646d41
+	echo powerpc64-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    ppc:Linux:*:*)
646d41
+	echo powerpc-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    s390:Linux:*:* | s390x:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-ibm-linux
646d41
+	exit ;;
646d41
+    sh64*:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    sh*:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    sparc:Linux:*:* | sparc64:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    tile*:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    vax:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-dec-linux-gnu
646d41
+	exit ;;
646d41
+    x86_64:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    xtensa*:Linux:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
646d41
+	exit ;;
646d41
+    i*86:DYNIX/ptx:4*:*)
646d41
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
646d41
+	# earlier versions are messed up and put the nodename in both
646d41
+	# sysname and nodename.
646d41
 	echo i386-sequent-sysv4
646d41
-	exit 0 ;;
646d41
-    i?86:UNIX_SV:4.2MP:2.*)
646d41
-        # Unixware is an offshoot of SVR4, but it has its own version
646d41
-        # number series starting with 2...
646d41
-        # I am not positive that other SVR4 systems won't match this,
646d41
+	exit ;;
646d41
+    i*86:UNIX_SV:4.2MP:2.*)
646d41
+	# Unixware is an offshoot of SVR4, but it has its own version
646d41
+	# number series starting with 2...
646d41
+	# I am not positive that other SVR4 systems won't match this,
646d41
 	# I just have to hope.  -- rms.
646d41
-        # Use sysv4.2uw... so that sysv4* matches it.
646d41
+	# Use sysv4.2uw... so that sysv4* matches it.
646d41
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
646d41
-	exit 0 ;;
646d41
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
646d41
+	exit ;;
646d41
+    i*86:OS/2:*:*)
646d41
+	# If we were able to find `uname', then EMX Unix compatibility
646d41
+	# is probably installed.
646d41
+	echo ${UNAME_MACHINE}-pc-os2-emx
646d41
+	exit ;;
646d41
+    i*86:XTS-300:*:STOP)
646d41
+	echo ${UNAME_MACHINE}-unknown-stop
646d41
+	exit ;;
646d41
+    i*86:atheos:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-atheos
646d41
+	exit ;;
646d41
+    i*86:syllable:*:*)
646d41
+	echo ${UNAME_MACHINE}-pc-syllable
646d41
+	exit ;;
646d41
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
646d41
+	echo i386-unknown-lynxos${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    i*86:*DOS:*:*)
646d41
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
646d41
+	exit ;;
646d41
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
646d41
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
646d41
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
646d41
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
646d41
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
646d41
 	else
646d41
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
646d41
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
646d41
 	fi
646d41
-	exit 0 ;;
646d41
-    i?86:MS-DOS:5:50)
646d41
-    	# DJGPP v2
646d41
-	echo ${UNAME_MACHINE}-pc-msdos
646d41
-        exit 0 ;;
646d41
-    i?86:*:5:*)
646d41
-        # Fixed at (any) Pentium or better
646d41
-        UNAME_MACHINE=i586
646d41
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ||
646d41
-	   [ ${UNAME_SYSTEM} = "OpenUNIX" ]; then
646d41
-            echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
646d41
-        else
646d41
-            echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
646d41
-        fi
646d41
-        exit 0 ;;
646d41
-    i?86:*:3.2:*)
646d41
+	exit ;;
646d41
+    i*86:*:5:[678]*)
646d41
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
646d41
+	case `/bin/uname -X | grep "^Machine"` in
646d41
+	    *486*)	     UNAME_MACHINE=i486 ;;
646d41
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
646d41
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
646d41
+	esac
646d41
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
646d41
+	exit ;;
646d41
+    i*86:*:3.2:*)
646d41
 	if test -f /usr/options/cb.name; then
646d41
 		UNAME_REL=`sed -n 's/.*Version //p' 
646d41
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
646d41
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
646d41
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
646d41
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
646d41
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
646d41
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
646d41
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
646d41
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
646d41
 			&& UNAME_MACHINE=i586
646d41
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
646d41
+			&& UNAME_MACHINE=i686
646d41
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
646d41
+			&& UNAME_MACHINE=i686
646d41
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
646d41
 	else
646d41
 		echo ${UNAME_MACHINE}-pc-sysv32
646d41
 	fi
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     pc:*:*:*)
646d41
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
646d41
-        # the processor, so we play safe by assuming i386.
646d41
-	echo i386-pc-msdosdjgpp
646d41
-        exit 0 ;;
646d41
+	# Left here for compatibility:
646d41
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
646d41
+	# the processor, so we play safe by assuming i586.
646d41
+	# Note: whatever this is, it MUST be the same as what config.sub
646d41
+	# prints for the "djgpp" host, or else GDB configury will decide that
646d41
+	# this is a cross-build.
646d41
+	echo i586-pc-msdosdjgpp
646d41
+	exit ;;
646d41
     Intel:Mach:3*:*)
646d41
 	echo i386-pc-mach3
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     paragon:*:*:*)
646d41
 	echo i860-intel-osf1
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     i860:*:4.*:*) # i860-SVR4
646d41
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
646d41
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
646d41
 	else # Add other i860-SVR4 vendors below as they are discovered.
646d41
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
646d41
 	fi
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     mini*:CTIX:SYS*5:*)
646d41
 	# "miniframe"
646d41
 	echo m68010-convergent-sysv
646d41
-	exit 0 ;;
646d41
-    M68*:*:R3V[567]*:*)
646d41
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
646d41
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
646d41
+	exit ;;
646d41
+    mc68k:UNIX:SYSTEM5:3.51m)
646d41
+	echo m68k-convergent-sysv
646d41
+	exit ;;
646d41
+    M680?0:D-NIX:5.3:*)
646d41
+	echo m68k-diab-dnix
646d41
+	exit ;;
646d41
+    M68*:*:R3V[5678]*:*)
646d41
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
646d41
+    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)
646d41
 	OS_REL=''
646d41
 	test -r /etc/.relid \
646d41
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
646d41
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
646d41
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
646d41
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
646d41
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
646d41
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
646d41
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
646d41
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
646d41
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
646d41
-          && echo i486-ncr-sysv4 && exit 0 ;;
646d41
-    m68*:LynxOS:2.*:*)
646d41
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
646d41
+	  && { echo i486-ncr-sysv4; exit; } ;;
646d41
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
646d41
+	OS_REL='.3'
646d41
+	test -r /etc/.relid \
646d41
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
646d41
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
646d41
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
646d41
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
646d41
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
646d41
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
646d41
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
646d41
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
646d41
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     mc68030:UNIX_System_V:4.*:*)
646d41
 	echo m68k-atari-sysv4
646d41
-	exit 0 ;;
646d41
-    i?86:LynxOS:2.*:*)
646d41
-	echo i386-unknown-lynxos${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     TSUNAMI:LynxOS:2.*:*)
646d41
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
646d41
+	exit ;;
646d41
+    rs6000:LynxOS:2.*:*)
646d41
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
646d41
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
646d41
+	exit ;;
646d41
     SM[BE]S:UNIX_SV:*:*)
646d41
 	echo mips-dde-sysv${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    RM*:ReliantUNIX-*:*:*)
646d41
+	echo mips-sni-sysv4
646d41
+	exit ;;
646d41
     RM*:SINIX-*:*:*)
646d41
 	echo mips-sni-sysv4
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     *:SINIX-*:*:*)
646d41
 	if uname -p 2>/dev/null >/dev/null ; then
646d41
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
646d41
@@ -801,76 +1158,187 @@ EOF
646d41
 	else
646d41
 		echo ns32k-sni-sysv
646d41
 	fi
646d41
-	exit 0 ;;
646d41
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
646d41
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
646d41
-        echo i586-unisys-sysv4
646d41
-        exit 0 ;;
646d41
+	exit ;;
646d41
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
646d41
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
646d41
+	echo i586-unisys-sysv4
646d41
+	exit ;;
646d41
     *:UNIX_System_V:4*:FTX*)
646d41
 	# From Gerald Hewes <hewes@openmarket.com>.
646d41
 	# How about differentiating between stratus architectures? -djm
646d41
 	echo hppa1.1-stratus-sysv4
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     *:*:*:FTX*)
646d41
 	# From seanf@swdc.stratus.com.
646d41
 	echo i860-stratus-sysv4
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
+    i*86:VOS:*:*)
646d41
+	# From Paul.Green@stratus.com.
646d41
+	echo ${UNAME_MACHINE}-stratus-vos
646d41
+	exit ;;
646d41
+    *:VOS:*:*)
646d41
+	# From Paul.Green@stratus.com.
646d41
+	echo hppa1.1-stratus-vos
646d41
+	exit ;;
646d41
     mc68*:A/UX:*:*)
646d41
 	echo m68k-apple-aux${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    news*:NEWS-OS:*:6*)
646d41
+	exit ;;
646d41
+    news*:NEWS-OS:6*:*)
646d41
 	echo mips-sony-newsos6
646d41
-	exit 0 ;;
646d41
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
646d41
+	exit ;;
646d41
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
646d41
 	if [ -d /usr/nec ]; then
646d41
-	        echo mips-nec-sysv${UNAME_RELEASE}
646d41
+		echo mips-nec-sysv${UNAME_RELEASE}
646d41
 	else
646d41
-	        echo mips-unknown-sysv${UNAME_RELEASE}
646d41
+		echo mips-unknown-sysv${UNAME_RELEASE}
646d41
 	fi
646d41
-        exit 0 ;;
646d41
+	exit ;;
646d41
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
646d41
 	echo powerpc-be-beos
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
646d41
 	echo powerpc-apple-beos
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
646d41
 	echo i586-pc-beos
646d41
-	exit 0 ;;
646d41
-    BeMac:Haiku:*:*)
646d41
-	echo powerpc-apple-haiku
646d41
 	exit ;;
646d41
-    BePC:Haiku:*:*)
646d41
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
646d41
 	echo i586-pc-haiku
646d41
 	exit ;;
646d41
-    "Power Macintosh":Rhapsody:*)
646d41
+    x86_64:Haiku:*:*)
646d41
+	echo x86_64-unknown-haiku
646d41
+	exit ;;
646d41
+    SX-4:SUPER-UX:*:*)
646d41
+	echo sx4-nec-superux${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    SX-5:SUPER-UX:*:*)
646d41
+	echo sx5-nec-superux${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    SX-6:SUPER-UX:*:*)
646d41
+	echo sx6-nec-superux${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    SX-7:SUPER-UX:*:*)
646d41
+	echo sx7-nec-superux${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    SX-8:SUPER-UX:*:*)
646d41
+	echo sx8-nec-superux${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    SX-8R:SUPER-UX:*:*)
646d41
+	echo sx8r-nec-superux${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    Power*:Rhapsody:*:*)
646d41
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    "Power Macintosh":"Mac OS":*)
646d41
-	echo powerpc-apple-macosx${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    "Power Macintosh":"Darwin":*)
646d41
-	echo powerpc-apple-macosx${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    "i386":"Darwin":*)
646d41
-	echo i386-apple-macosx${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    "x86":"Darwin":*)
646d41
-	echo i386-apple-macosx${UNAME_RELEASE}
646d41
-	exit 0 ;;
646d41
-    *:OS/2:*:*)
646d41
-        echo "i386-pc-os2_emx"
646d41
-	exit 0;;
646d41
-    *:OpenVMS:*:*)
646d41
-	UNAME_PROCESSOR=`uname -p | tr [A-Z] [a-z]`
646d41
-	echo "${UNAME_PROCESSOR}-hp-openvms"
646d41
-	exit 0;;
646d41
+	exit ;;
646d41
+    *:Rhapsody:*:*)
646d41
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *:Darwin:*:*)
646d41
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
646d41
+	case $UNAME_PROCESSOR in
646d41
+	    i386)
646d41
+		eval $set_cc_for_build
646d41
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
646d41
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
646d41
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
646d41
+		      grep IS_64BIT_ARCH >/dev/null
646d41
+		  then
646d41
+		      UNAME_PROCESSOR="x86_64"
646d41
+		  fi
646d41
+		fi ;;
646d41
+	    unknown) UNAME_PROCESSOR=powerpc ;;
646d41
+	esac
646d41
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
646d41
+	UNAME_PROCESSOR=`uname -p`
646d41
+	if test "$UNAME_PROCESSOR" = "x86"; then
646d41
+		UNAME_PROCESSOR=i386
646d41
+		UNAME_MACHINE=pc
646d41
+	fi
646d41
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *:QNX:*:4*)
646d41
+	echo i386-pc-qnx
646d41
+	exit ;;
646d41
+    NEO-?:NONSTOP_KERNEL:*:*)
646d41
+	echo neo-tandem-nsk${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    NSE-*:NONSTOP_KERNEL:*:*)
646d41
+	echo nse-tandem-nsk${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    NSR-?:NONSTOP_KERNEL:*:*)
646d41
+	echo nsr-tandem-nsk${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *:NonStop-UX:*:*)
646d41
+	echo mips-compaq-nonstopux
646d41
+	exit ;;
646d41
+    BS2000:POSIX*:*:*)
646d41
+	echo bs2000-siemens-sysv
646d41
+	exit ;;
646d41
+    DS/*:UNIX_System_V:*:*)
646d41
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *:Plan9:*:*)
646d41
+	# "uname -m" is not consistent, so use $cputype instead. 386
646d41
+	# is converted to i386 for consistency with other x86
646d41
+	# operating systems.
646d41
+	if test "$cputype" = "386"; then
646d41
+	    UNAME_MACHINE=i386
646d41
+	else
646d41
+	    UNAME_MACHINE="$cputype"
646d41
+	fi
646d41
+	echo ${UNAME_MACHINE}-unknown-plan9
646d41
+	exit ;;
646d41
+    *:TOPS-10:*:*)
646d41
+	echo pdp10-unknown-tops10
646d41
+	exit ;;
646d41
+    *:TENEX:*:*)
646d41
+	echo pdp10-unknown-tenex
646d41
+	exit ;;
646d41
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
646d41
+	echo pdp10-dec-tops20
646d41
+	exit ;;
646d41
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
646d41
+	echo pdp10-xkl-tops20
646d41
+	exit ;;
646d41
+    *:TOPS-20:*:*)
646d41
+	echo pdp10-unknown-tops20
646d41
+	exit ;;
646d41
+    *:ITS:*:*)
646d41
+	echo pdp10-unknown-its
646d41
+	exit ;;
646d41
+    SEI:*:*:SEIUX)
646d41
+	echo mips-sei-seiux${UNAME_RELEASE}
646d41
+	exit ;;
646d41
+    *:DragonFly:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
646d41
+	exit ;;
646d41
+    *:*VMS:*:*)
646d41
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
646d41
+	case "${UNAME_MACHINE}" in
646d41
+	    A*) echo alpha-dec-vms ; exit ;;
646d41
+	    I*) echo ia64-dec-vms ; exit ;;
646d41
+	    V*) echo vax-dec-vms ; exit ;;
646d41
+	esac ;;
646d41
+    *:XENIX:*:SysV)
646d41
+	echo i386-pc-xenix
646d41
+	exit ;;
646d41
+    i*86:skyos:*:*)
646d41
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
646d41
+	exit ;;
646d41
+    i*86:rdos:*:*)
646d41
+	echo ${UNAME_MACHINE}-pc-rdos
646d41
+	exit ;;
646d41
+    i*86:AROS:*:*)
646d41
+	echo ${UNAME_MACHINE}-pc-aros
646d41
+	exit ;;
646d41
+    x86_64:VMkernel:*:*)
646d41
+	echo ${UNAME_MACHINE}-unknown-esx
646d41
+	exit ;;
646d41
 esac
646d41
 
646d41
-#echo '(No uname command or uname output not recognized.)' 1>&2
646d41
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
646d41
-
646d41
-cat >dummy.c <
646d41
+eval $set_cc_for_build
646d41
+cat >$dummy.c <
646d41
 #ifdef _SEQUENT_
646d41
 # include <sys/types.h>
646d41
 # include <sys/utsname.h>
646d41
@@ -886,16 +1354,16 @@ main ()
646d41
 #include <sys/param.h>
646d41
   printf ("m68k-sony-newsos%s\n",
646d41
 #ifdef NEWSOS4
646d41
-          "4"
646d41
+	"4"
646d41
 #else
646d41
-	  ""
646d41
+	""
646d41
 #endif
646d41
-         ); exit (0);
646d41
+	); exit (0);
646d41
 #endif
646d41
 #endif
646d41
 
646d41
 #if defined (__arm) && defined (__acorn) && defined (__unix)
646d41
-  printf ("arm-acorn-riscix"); exit (0);
646d41
+  printf ("arm-acorn-riscix\n"); exit (0);
646d41
 #endif
646d41
 
646d41
 #if defined (hp300) && !defined (hpux)
646d41
@@ -908,7 +1376,10 @@ main ()
646d41
 #endif
646d41
   int version;
646d41
   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
646d41
-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
646d41
+  if (version < 4)
646d41
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
646d41
+  else
646d41
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
646d41
   exit (0);
646d41
 #endif
646d41
 
646d41
@@ -953,11 +1424,24 @@ main ()
646d41
 #endif
646d41
 
646d41
 #if defined (vax)
646d41
-#if !defined (ultrix)
646d41
-  printf ("vax-dec-bsd\n"); exit (0);
646d41
-#else
646d41
-  printf ("vax-dec-ultrix\n"); exit (0);
646d41
-#endif
646d41
+# if !defined (ultrix)
646d41
+#  include <sys/param.h>
646d41
+#  if defined (BSD)
646d41
+#   if BSD == 43
646d41
+      printf ("vax-dec-bsd4.3\n"); exit (0);
646d41
+#   else
646d41
+#    if BSD == 199006
646d41
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
646d41
+#    else
646d41
+      printf ("vax-dec-bsd\n"); exit (0);
646d41
+#    endif
646d41
+#   endif
646d41
+#  else
646d41
+    printf ("vax-dec-bsd\n"); exit (0);
646d41
+#  endif
646d41
+# else
646d41
+    printf ("vax-dec-ultrix\n"); exit (0);
646d41
+# endif
646d41
 #endif
646d41
 
646d41
 #if defined (alliant) && defined (i860)
646d41
@@ -968,12 +1452,12 @@ main ()
646d41
 }
646d41
 EOF
646d41
 
646d41
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
646d41
-rm -f dummy.c dummy
646d41
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
646d41
+	{ echo "$SYSTEM_NAME"; exit; }
646d41
 
646d41
 # Apollos put the system type in the environment.
646d41
 
646d41
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
646d41
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
646d41
 
646d41
 # Convex versions that predate uname can use getsysinfo(1)
646d41
 
646d41
@@ -982,30 +1466,69 @@ then
646d41
     case `getsysinfo -f cpu_type` in
646d41
     c1*)
646d41
 	echo c1-convex-bsd
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     c2*)
646d41
 	if getsysinfo -f scalar_acc
646d41
 	then echo c32-convex-bsd
646d41
 	else echo c2-convex-bsd
646d41
 	fi
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     c34*)
646d41
 	echo c34-convex-bsd
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     c38*)
646d41
 	echo c38-convex-bsd
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     c4*)
646d41
 	echo c4-convex-bsd
646d41
-	exit 0 ;;
646d41
+	exit ;;
646d41
     esac
646d41
 fi
646d41
 
646d41
-if [ x$CONFIG_NOFAIL = xTRUE ]; then
646d41
-	echo unknownCPU-unknownMFR-unknownOS
646d41
-	exit 0
646d41
-fi
646d41
+cat >&2 <
646d41
+$0: unable to guess system type
646d41
+
646d41
+This script, last modified $timestamp, has failed to recognize
646d41
+the operating system you are using. It is advised that you
646d41
+download the most up to date version of the config scripts from
646d41
+
646d41
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
646d41
+and
646d41
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
646d41
+
646d41
+If the version you run ($0) is already up to date, please
646d41
+send the following data and any information you think might be
646d41
+pertinent to <config-patches@gnu.org> in order to provide the needed
646d41
+information to handle your system.
646d41
+
646d41
+config.guess timestamp = $timestamp
646d41
 
646d41
-#echo '(Unable to guess system type)' 1>&2
646d41
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
646d41
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
646d41
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
646d41
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
646d41
+
646d41
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
646d41
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
646d41
+
646d41
+hostinfo               = `(hostinfo) 2>/dev/null`
646d41
+/bin/universe          = `(/bin/universe) 2>/dev/null`
646d41
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
646d41
+/bin/arch              = `(/bin/arch) 2>/dev/null`
646d41
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
646d41
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
646d41
+
646d41
+UNAME_MACHINE = ${UNAME_MACHINE}
646d41
+UNAME_RELEASE = ${UNAME_RELEASE}
646d41
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
646d41
+UNAME_VERSION = ${UNAME_VERSION}
646d41
+EOF
646d41
 
646d41
 exit 1
646d41
+
646d41
+# Local variables:
646d41
+# eval: (add-hook 'write-file-hooks 'time-stamp)
646d41
+# time-stamp-start: "timestamp='"
646d41
+# time-stamp-format: "%:y-%02m-%02d"
646d41
+# time-stamp-end: "'"
646d41
+# End:
646d41
diff --git a/autoconf/config.sub b/autoconf/config.sub
646d41
index bef70d4..872199a 100755
646d41
--- a/autoconf/config.sub
646d41
+++ b/autoconf/config.sub
646d41
@@ -1,37 +1,40 @@
646d41
 #! /bin/sh
646d41
-# @(#)config.sub	1.9 09/09/15 Copyright 1999-2009 J. Schilling
646d41
-#
646d41
-# Configuration validation subroutine script, version 1.1.
646d41
-#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
646d41
-# This file is (in principle) common to ALL GNU software.
646d41
-# The presence of a machine in this file suggests that SOME GNU software
646d41
-# can handle that machine.  It does not imply ALL GNU software can.
646d41
-#
646d41
-# This file is free software; you can redistribute it and/or modify
646d41
-# it under the terms of the GNU General Public License as published by
646d41
-# the Free Software Foundation; either version 2 of the License, or
646d41
+# Configuration validation subroutine script.
646d41
+#   Copyright 1992-2013 Free Software Foundation, Inc.
646d41
+
646d41
+timestamp='2013-02-12'
646d41
+
646d41
+# This file is free software; you can redistribute it and/or modify it
646d41
+# under the terms of the GNU General Public License as published by
646d41
+# the Free Software Foundation; either version 3 of the License, or
646d41
 # (at your option) any later version.
646d41
 #
646d41
-# This program is distributed in the hope that it will be useful,
646d41
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
646d41
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
646d41
-# GNU General Public License for more details.
646d41
+# This program is distributed in the hope that it will be useful, but
646d41
+# WITHOUT ANY WARRANTY; without even the implied warranty of
646d41
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
646d41
+# General Public License for more details.
646d41
 #
646d41
 # You should have received a copy of the GNU General Public License
646d41
-# along with this program; if not, write to the Free Software
646d41
-# Foundation, Inc., 59 Temple Place - Suite 330,
646d41
-# Boston, MA 02111-1307, USA.
646d41
-
646d41
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
646d41
+#
646d41
 # As a special exception to the GNU General Public License, if you
646d41
 # distribute this file as part of a program that contains a
646d41
 # configuration script generated by Autoconf, you may include it under
646d41
-# the same distribution terms that you use for the rest of that program.
646d41
+# the same distribution terms that you use for the rest of that
646d41
+# program.  This Exception is an additional permission under section 7
646d41
+# of the GNU General Public License, version 3 ("GPLv3").
646d41
+
646d41
 
646d41
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
646d41
+#
646d41
 # Configuration subroutine to validate and canonicalize a configuration type.
646d41
 # Supply the specified configuration type as an argument.
646d41
 # If it is invalid, we print an error message on stderr and exit with code 1.
646d41
 # Otherwise, we print the canonical config type on stdout and succeed.
646d41
 
646d41
+# You can get the latest version of this script from:
646d41
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
646d41
+
646d41
 # This file is supposed to be the same for all GNU packages
646d41
 # and recognize all the CPU types, system types and aliases
646d41
 # that are meaningful with *any* GNU software.
646d41
@@ -47,33 +50,83 @@
646d41
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
646d41
 # It is wrong to echo any other type of specification.
646d41
 
646d41
-if [ x$1 = x ]
646d41
-then
646d41
-	echo Configuration name missing. 1>&2
646d41
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
646d41
-	echo "or     $0 ALIAS" 1>&2
646d41
-	echo where ALIAS is a recognized configuration type. 1>&2
646d41
-	exit 1
646d41
-fi
646d41
+me=`echo "$0" | sed -e 's,.*/,,'`
646d41
 
646d41
-# First pass through any local machine types.
646d41
-case $1 in
646d41
-	*local*)
646d41
-		echo $1
646d41
-		exit 0
646d41
-		;;
646d41
-	*)
646d41
-	;;
646d41
+usage="\
646d41
+Usage: $0 [OPTION] CPU-MFR-OPSYS
646d41
+       $0 [OPTION] ALIAS
646d41
+
646d41
+Canonicalize a configuration name.
646d41
+
646d41
+Operation modes:
646d41
+  -h, --help         print this help, then exit
646d41
+  -t, --time-stamp   print date of last modification, then exit
646d41
+  -v, --version      print version number, then exit
646d41
+
646d41
+Report bugs and patches to <config-patches@gnu.org>."
646d41
+
646d41
+version="\
646d41
+GNU config.sub ($timestamp)
646d41
+
646d41
+Copyright 1992-2013 Free Software Foundation, Inc.
646d41
+
646d41
+This is free software; see the source for copying conditions.  There is NO
646d41
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
646d41
+
646d41
+help="
646d41
+Try \`$me --help' for more information."
646d41
+
646d41
+# Parse command line
646d41
+while test $# -gt 0 ; do
646d41
+  case $1 in
646d41
+    --time-stamp | --time* | -t )
646d41
+       echo "$timestamp" ; exit ;;
646d41
+    --version | -v )
646d41
+       echo "$version" ; exit ;;
646d41
+    --help | --h* | -h )
646d41
+       echo "$usage"; exit ;;
646d41
+    -- )     # Stop option processing
646d41
+       shift; break ;;
646d41
+    - )	# Use stdin as input.
646d41
+       break ;;
646d41
+    -* )
646d41
+       echo "$me: invalid option $1$help"
646d41
+       exit 1 ;;
646d41
+
646d41
+    *local*)
646d41
+       # First pass through any local machine types.
646d41
+       echo $1
646d41
+       exit ;;
646d41
+
646d41
+    * )
646d41
+       break ;;
646d41
+  esac
646d41
+done
646d41
+
646d41
+case $# in
646d41
+ 0) echo "$me: missing argument$help" >&2
646d41
+    exit 1;;
646d41
+ 1) ;;
646d41
+ *) echo "$me: too many arguments$help" >&2
646d41
+    exit 1;;
646d41
 esac
646d41
 
646d41
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
646d41
 # Here we must recognize all the valid KERNEL-OS combinations.
646d41
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
646d41
 case $maybe_os in
646d41
-  linux-gnu*)
646d41
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
646d41
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
646d41
+  knetbsd*-gnu* | netbsd*-gnu* | \
646d41
+  kopensolaris*-gnu* | \
646d41
+  storm-chaos* | os2-emx* | rtmk-nova*)
646d41
     os=-$maybe_os
646d41
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
646d41
     ;;
646d41
+  android-linux)
646d41
+    os=-linux-android
646d41
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
646d41
+    ;;
646d41
   *)
646d41
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
646d41
     if [ $basic_machine != $1 ]
646d41
@@ -96,15 +149,40 @@ case $os in
646d41
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
646d41
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
646d41
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
646d41
-	-apple)
646d41
+	-apple | -axis | -knuth | -cray | -microblaze*)
646d41
+		os=
646d41
+		basic_machine=$1
646d41
+		;;
646d41
+	-bluegene*)
646d41
+		os=-cnk
646d41
+		;;
646d41
+	-sim | -cisco | -oki | -wec | -winbond)
646d41
 		os=
646d41
 		basic_machine=$1
646d41
 		;;
646d41
+	-scout)
646d41
+		;;
646d41
+	-wrs)
646d41
+		os=-vxworks
646d41
+		basic_machine=$1
646d41
+		;;
646d41
+	-chorusos*)
646d41
+		os=-chorusos
646d41
+		basic_machine=$1
646d41
+		;;
646d41
+	-chorusrdb)
646d41
+		os=-chorusrdb
646d41
+		basic_machine=$1
646d41
+		;;
646d41
 	-hiux*)
646d41
 		os=-hiuxwe2
646d41
 		;;
646d41
+	-sco6)
646d41
+		os=-sco5v6
646d41
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
646d41
+		;;
646d41
 	-sco5)
646d41
-		os=sco3.2v5
646d41
+		os=-sco3.2v5
646d41
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
646d41
 		;;
646d41
 	-sco4)
646d41
@@ -119,10 +197,17 @@ case $os in
646d41
 		# Don't forget version if it is 3.2v4 or newer.
646d41
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
646d41
 		;;
646d41
+	-sco5v6*)
646d41
+		# Don't forget version if it is 3.2v4 or newer.
646d41
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
646d41
+		;;
646d41
 	-sco*)
646d41
 		os=-sco3.2v2
646d41
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
646d41
 		;;
646d41
+	-udk*)
646d41
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
646d41
+		;;
646d41
 	-isc)
646d41
 		os=-isc2.2
646d41
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
646d41
@@ -133,6 +218,12 @@ case $os in
646d41
 	-isc*)
646d41
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
646d41
 		;;
646d41
+	-lynx*178)
646d41
+		os=-lynxos178
646d41
+		;;
646d41
+	-lynx*5)
646d41
+		os=-lynxos5
646d41
+		;;
646d41
 	-lynx*)
646d41
 		os=-lynxos
646d41
 		;;
646d41
@@ -145,27 +236,123 @@ case $os in
646d41
 	-psos*)
646d41
 		os=-psos
646d41
 		;;
646d41
+	-mint | -mint[0-9]*)
646d41
+		basic_machine=m68k-atari
646d41
+		os=-mint
646d41
+		;;
646d41
 esac
646d41
 
646d41
 # Decode aliases for certain CPU-COMPANY combinations.
646d41
 case $basic_machine in
646d41
 	# Recognize the basic CPU types without company name.
646d41
 	# Some are omitted here because they have special meanings below.
646d41
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
646d41
-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
646d41
-		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0? \
646d41
-		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
646d41
-		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
646d41
-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
646d41
-		| mipstx39 | mipstx39el \
646d41
-		| sparc | sparclet | sparclite | sparc64 | v850)
646d41
+	1750a | 580 \
646d41
+	| a29k \
646d41
+	| aarch64 | aarch64_be \
646d41
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
646d41
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
646d41
+	| am33_2.0 \
646d41
+	| arc \
646d41
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
646d41
+	| avr | avr32 \
646d41
+	| be32 | be64 \
646d41
+	| bfin \
646d41
+	| c4x | clipper \
646d41
+	| d10v | d30v | dlx | dsp16xx \
646d41
+	| epiphany \
646d41
+	| fido | fr30 | frv \
646d41
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
646d41
+	| hexagon \
646d41
+	| i370 | i860 | i960 | ia64 \
646d41
+	| ip2k | iq2000 \
646d41
+	| le32 | le64 \
646d41
+	| lm32 \
646d41
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
646d41
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
646d41
+	| mips | mipsbe | mipseb | mipsel | mipsle \
646d41
+	| mips16 \
646d41
+	| mips64 | mips64el \
646d41
+	| mips64octeon | mips64octeonel \
646d41
+	| mips64orion | mips64orionel \
646d41
+	| mips64r5900 | mips64r5900el \
646d41
+	| mips64vr | mips64vrel \
646d41
+	| mips64vr4100 | mips64vr4100el \
646d41
+	| mips64vr4300 | mips64vr4300el \
646d41
+	| mips64vr5000 | mips64vr5000el \
646d41
+	| mips64vr5900 | mips64vr5900el \
646d41
+	| mipsisa32 | mipsisa32el \
646d41
+	| mipsisa32r2 | mipsisa32r2el \
646d41
+	| mipsisa64 | mipsisa64el \
646d41
+	| mipsisa64r2 | mipsisa64r2el \
646d41
+	| mipsisa64sb1 | mipsisa64sb1el \
646d41
+	| mipsisa64sr71k | mipsisa64sr71kel \
646d41
+	| mipsr5900 | mipsr5900el \
646d41
+	| mipstx39 | mipstx39el \
646d41
+	| mn10200 | mn10300 \
646d41
+	| moxie \
646d41
+	| mt \
646d41
+	| msp430 \
646d41
+	| nds32 | nds32le | nds32be \
646d41
+	| nios | nios2 | nios2eb | nios2el \
646d41
+	| ns16k | ns32k \
646d41
+	| open8 \
646d41
+	| or1k | or32 \
646d41
+	| pdp10 | pdp11 | pj | pjl \
646d41
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
646d41
+	| pyramid \
646d41
+	| rl78 | rx \
646d41
+	| score \
646d41
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
646d41
+	| sh64 | sh64le \
646d41
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
646d41
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
646d41
+	| spu \
646d41
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
646d41
+	| ubicom32 \
646d41
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
646d41
+	| we32k \
646d41
+	| x86 | xc16x | xstormy16 | xtensa \
646d41
+	| z8k | z80)
646d41
 		basic_machine=$basic_machine-unknown
646d41
 		;;
646d41
+	c54x)
646d41
+		basic_machine=tic54x-unknown
646d41
+		;;
646d41
+	c55x)
646d41
+		basic_machine=tic55x-unknown
646d41
+		;;
646d41
+	c6x)
646d41
+		basic_machine=tic6x-unknown
646d41
+		;;
646d41
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
646d41
+		basic_machine=$basic_machine-unknown
646d41
+		os=-none
646d41
+		;;
646d41
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
646d41
+		;;
646d41
+	ms1)
646d41
+		basic_machine=mt-unknown
646d41
+		;;
646d41
+
646d41
+	strongarm | thumb | xscale)
646d41
+		basic_machine=arm-unknown
646d41
+		;;
646d41
+	xgate)
646d41
+		basic_machine=$basic_machine-unknown
646d41
+		os=-none
646d41
+		;;
646d41
+	xscaleeb)
646d41
+		basic_machine=armeb-unknown
646d41
+		;;
646d41
+
646d41
+	xscaleel)
646d41
+		basic_machine=armel-unknown
646d41
+		;;
646d41
 
646d41
 	# We use `pc' rather than `unknown'
646d41
 	# because (1) that's what they normally are, and
646d41
 	# (2) the word "unknown" tends to confuse beginning users.
646d41
-	i[34567]86)
646d41
+	i*86 | x86_64)
646d41
 	  basic_machine=$basic_machine-pc
646d41
 	  ;;
646d41
 	# Object if more than one company name word.
646d41
@@ -174,29 +361,108 @@ case $basic_machine in
646d41
 		exit 1
646d41
 		;;
646d41
 	# Recognize the basic CPU types with company name.
646d41
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
646d41
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
646d41
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
646d41
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
646d41
-	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0?-* \
646d41
-	      | ia64-* \
646d41
-	      | alpha-* | alphaev5-* | alphaev56-* | alphaev6-* | we32k-* | cydra-* \
646d41
-	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
646d41
-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
646d41
-	      | sparc64-* | mips64-* | mipsel-* \
646d41
-	      | mips64el-* | mips64orion-* | mips64orionel-*  \
646d41
-	      | mipstx39-* | mipstx39el-* \
646d41
-	      | f301-* \
646d41
-	      | x86-* | x86_64-* | amd64-*)
646d41
+	580-* \
646d41
+	| a29k-* \
646d41
+	| aarch64-* | aarch64_be-* \
646d41
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
646d41
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
646d41
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
646d41
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
646d41
+	| avr-* | avr32-* \
646d41
+	| be32-* | be64-* \
646d41
+	| bfin-* | bs2000-* \
646d41
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
646d41
+	| clipper-* | craynv-* | cydra-* \
646d41
+	| d10v-* | d30v-* | dlx-* \
646d41
+	| elxsi-* \
646d41
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
646d41
+	| h8300-* | h8500-* \
646d41
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
646d41
+	| hexagon-* \
646d41
+	| i*86-* | i860-* | i960-* | ia64-* \
646d41
+	| ip2k-* | iq2000-* \
646d41
+	| le32-* | le64-* \
646d41
+	| lm32-* \
646d41
+	| m32c-* | m32r-* | m32rle-* \
646d41
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
646d41
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
646d41
+	| microblaze-* | microblazeel-* \
646d41
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
646d41
+	| mips16-* \
646d41
+	| mips64-* | mips64el-* \
646d41
+	| mips64octeon-* | mips64octeonel-* \
646d41
+	| mips64orion-* | mips64orionel-* \
646d41
+	| mips64r5900-* | mips64r5900el-* \
646d41
+	| mips64vr-* | mips64vrel-* \
646d41
+	| mips64vr4100-* | mips64vr4100el-* \
646d41
+	| mips64vr4300-* | mips64vr4300el-* \
646d41
+	| mips64vr5000-* | mips64vr5000el-* \
646d41
+	| mips64vr5900-* | mips64vr5900el-* \
646d41
+	| mipsisa32-* | mipsisa32el-* \
646d41
+	| mipsisa32r2-* | mipsisa32r2el-* \
646d41
+	| mipsisa64-* | mipsisa64el-* \
646d41
+	| mipsisa64r2-* | mipsisa64r2el-* \
646d41
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
646d41
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
646d41
+	| mipsr5900-* | mipsr5900el-* \
646d41
+	| mipstx39-* | mipstx39el-* \
646d41
+	| mmix-* \
646d41
+	| mt-* \
646d41
+	| msp430-* \
646d41
+	| nds32-* | nds32le-* | nds32be-* \
646d41
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
646d41
+	| none-* | np1-* | ns16k-* | ns32k-* \
646d41
+	| open8-* \
646d41
+	| orion-* \
646d41
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
646d41
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
646d41
+	| pyramid-* \
646d41
+	| rl78-* | romp-* | rs6000-* | rx-* \
646d41
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
646d41
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
646d41
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
646d41
+	| sparclite-* \
646d41
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
646d41
+	| tahoe-* \
646d41
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
646d41
+	| tile*-* \
646d41
+	| tron-* \
646d41
+	| ubicom32-* \
646d41
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
646d41
+	| vax-* \
646d41
+	| we32k-* \
646d41
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
646d41
+	| xstormy16-* | xtensa*-* \
646d41
+	| ymp-* \
646d41
+	| z8k-* | z80-*)
646d41
+		;;
646d41
+	# Recognize the basic CPU types without company name, with glob match.
646d41
+	xtensa*)
646d41
+		basic_machine=$basic_machine-unknown
646d41
 		;;
646d41
 	# Recognize the various machine names and aliases which stand
646d41
 	# for a CPU type and a company and sometimes even an OS.
646d41
+	386bsd)
646d41
+		basic_machine=i386-unknown
646d41
+		os=-bsd
646d41
+		;;
646d41
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
646d41
 		basic_machine=m68000-att
646d41
 		;;
646d41
 	3b*)
646d41
 		basic_machine=we32k-att
646d41
 		;;
646d41
+	a29khif)
646d41
+		basic_machine=a29k-amd
646d41
+		os=-udi
646d41
+		;;
646d41
+	abacus)
646d41
+		basic_machine=abacus-unknown
646d41
+		;;
646d41
+	adobe68k)
646d41
+		basic_machine=m68010-adobe
646d41
+		os=-scout
646d41
+		;;
646d41
 	alliant | fx80)
646d41
 		basic_machine=fx80-alliant
646d41
 		;;
646d41
@@ -207,25 +473,39 @@ case $basic_machine in
646d41
 		basic_machine=a29k-none
646d41
 		os=-bsd
646d41
 		;;
646d41
+	amd64)
646d41
+		basic_machine=x86_64-pc
646d41
+		;;
646d41
+	amd64-*)
646d41
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		;;
646d41
 	amdahl)
646d41
 		basic_machine=580-amdahl
646d41
 		os=-sysv
646d41
 		;;
646d41
 	amiga | amiga-*)
646d41
-		basic_machine=m68k-cbm
646d41
+		basic_machine=m68k-unknown
646d41
 		;;
646d41
 	amigaos | amigados)
646d41
-		basic_machine=m68k-cbm
646d41
+		basic_machine=m68k-unknown
646d41
 		os=-amigaos
646d41
 		;;
646d41
 	amigaunix | amix)
646d41
-		basic_machine=m68k-cbm
646d41
+		basic_machine=m68k-unknown
646d41
 		os=-sysv4
646d41
 		;;
646d41
 	apollo68)
646d41
 		basic_machine=m68k-apollo
646d41
 		os=-sysv
646d41
 		;;
646d41
+	apollo68bsd)
646d41
+		basic_machine=m68k-apollo
646d41
+		os=-bsd
646d41
+		;;
646d41
+	aros)
646d41
+		basic_machine=i386-pc
646d41
+		os=-aros
646d41
+		;;
646d41
 	aux)
646d41
 		basic_machine=m68k-apple
646d41
 		os=-aux
646d41
@@ -234,6 +514,35 @@ case $basic_machine in
646d41
 		basic_machine=ns32k-sequent
646d41
 		os=-dynix
646d41
 		;;
646d41
+	blackfin)
646d41
+		basic_machine=bfin-unknown
646d41
+		os=-linux
646d41
+		;;
646d41
+	blackfin-*)
646d41
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		os=-linux
646d41
+		;;
646d41
+	bluegene*)
646d41
+		basic_machine=powerpc-ibm
646d41
+		os=-cnk
646d41
+		;;
646d41
+	c54x-*)
646d41
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		;;
646d41
+	c55x-*)
646d41
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		;;
646d41
+	c6x-*)
646d41
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		;;
646d41
+	c90)
646d41
+		basic_machine=c90-cray
646d41
+		os=-unicos
646d41
+		;;
646d41
+	cegcc)
646d41
+		basic_machine=arm-unknown
646d41
+		os=-cegcc
646d41
+		;;
646d41
 	convex-c1)
646d41
 		basic_machine=c1-convex
646d41
 		os=-bsd
646d41
@@ -254,27 +563,45 @@ case $basic_machine in
646d41
 		basic_machine=c38-convex
646d41
 		os=-bsd
646d41
 		;;
646d41
-	cray | ymp)
646d41
-		basic_machine=ymp-cray
646d41
+	cray | j90)
646d41
+		basic_machine=j90-cray
646d41
 		os=-unicos
646d41
 		;;
646d41
-	cray2)
646d41
-		basic_machine=cray2-cray
646d41
-		os=-unicos
646d41
+	craynv)
646d41
+		basic_machine=craynv-cray
646d41
+		os=-unicosmp
646d41
 		;;
646d41
-	[ctj]90-cray)
646d41
-		basic_machine=c90-cray
646d41
-		os=-unicos
646d41
+	cr16 | cr16-*)
646d41
+		basic_machine=cr16-unknown
646d41
+		os=-elf
646d41
 		;;
646d41
 	crds | unos)
646d41
 		basic_machine=m68k-crds
646d41
 		;;
646d41
+	crisv32 | crisv32-* | etraxfs*)
646d41
+		basic_machine=crisv32-axis
646d41
+		;;
646d41
+	cris | cris-* | etrax*)
646d41
+		basic_machine=cris-axis
646d41
+		;;
646d41
+	crx)
646d41
+		basic_machine=crx-unknown
646d41
+		os=-elf
646d41
+		;;
646d41
 	da30 | da30-*)
646d41
 		basic_machine=m68k-da30
646d41
 		;;
646d41
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
646d41
 		basic_machine=mips-dec
646d41
 		;;
646d41
+	decsystem10* | dec10*)
646d41
+		basic_machine=pdp10-dec
646d41
+		os=-tops10
646d41
+		;;
646d41
+	decsystem20* | dec20*)
646d41
+		basic_machine=pdp10-dec
646d41
+		os=-tops20
646d41
+		;;
646d41
 	delta | 3300 | motorola-3300 | motorola-delta \
646d41
 	      | 3300-motorola | delta-motorola)
646d41
 		basic_machine=m68k-motorola
646d41
@@ -283,6 +610,14 @@ case $basic_machine in
646d41
 		basic_machine=m88k-motorola
646d41
 		os=-sysv3
646d41
 		;;
646d41
+	dicos)
646d41
+		basic_machine=i686-pc
646d41
+		os=-dicos
646d41
+		;;
646d41
+	djgpp)
646d41
+		basic_machine=i586-pc
646d41
+		os=-msdosdjgpp
646d41
+		;;
646d41
 	dpx20 | dpx20-*)
646d41
 		basic_machine=rs6000-bull
646d41
 		os=-bosx
646d41
@@ -302,6 +637,10 @@ case $basic_machine in
646d41
 	encore | umax | mmax)
646d41
 		basic_machine=ns32k-encore
646d41
 		;;
646d41
+	es1800 | OSE68k | ose68k | ose | OSE)
646d41
+		basic_machine=m68k-ericsson
646d41
+		os=-ose
646d41
+		;;
646d41
 	fx2800)
646d41
 		basic_machine=i860-alliant
646d41
 		;;
646d41
@@ -312,6 +651,10 @@ case $basic_machine in
646d41
 		basic_machine=tron-gmicro
646d41
 		os=-sysv
646d41
 		;;
646d41
+	go32)
646d41
+		basic_machine=i386-pc
646d41
+		os=-go32
646d41
+		;;
646d41
 	h3050r* | hiux*)
646d41
 		basic_machine=hppa1.1-hitachi
646d41
 		os=-hiuxwe2
646d41
@@ -320,6 +663,14 @@ case $basic_machine in
646d41
 		basic_machine=h8300-hitachi
646d41
 		os=-hms
646d41
 		;;
646d41
+	h8300xray)
646d41
+		basic_machine=h8300-hitachi
646d41
+		os=-xray
646d41
+		;;
646d41
+	h8500hms)
646d41
+		basic_machine=h8500-hitachi
646d41
+		os=-hms
646d41
+		;;
646d41
 	harris)
646d41
 		basic_machine=m88k-harris
646d41
 		os=-sysv3
646d41
@@ -335,13 +686,30 @@ case $basic_machine in
646d41
 		basic_machine=m68k-hp
646d41
 		os=-hpux
646d41
 		;;
646d41
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
646d41
+		basic_machine=hppa1.0-hp
646d41
+		;;
646d41
 	hp9k2[0-9][0-9] | hp9k31[0-9])
646d41
 		basic_machine=m68000-hp
646d41
 		;;
646d41
 	hp9k3[2-9][0-9])
646d41
 		basic_machine=m68k-hp
646d41
 		;;
646d41
-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
646d41
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
646d41
+		basic_machine=hppa1.0-hp
646d41
+		;;
646d41
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
646d41
+		basic_machine=hppa1.1-hp
646d41
+		;;
646d41
+	hp9k78[0-9] | hp78[0-9])
646d41
+		# FIXME: really hppa2.0-hp
646d41
+		basic_machine=hppa1.1-hp
646d41
+		;;
646d41
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
646d41
+		# FIXME: really hppa2.0-hp
646d41
+		basic_machine=hppa1.1-hp
646d41
+		;;
646d41
+	hp9k8[0-9][13679] | hp8[0-9][13679])
646d41
 		basic_machine=hppa1.1-hp
646d41
 		;;
646d41
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
646d41
@@ -350,27 +718,41 @@ case $basic_machine in
646d41
 	hppa-next)
646d41
 		os=-nextstep3
646d41
 		;;
646d41
+	hppaosf)
646d41
+		basic_machine=hppa1.1-hp
646d41
+		os=-osf
646d41
+		;;
646d41
+	hppro)
646d41
+		basic_machine=hppa1.1-hp
646d41
+		os=-proelf
646d41
+		;;
646d41
 	i370-ibm* | ibm*)
646d41
 		basic_machine=i370-ibm
646d41
-		os=-mvs
646d41
 		;;
646d41
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
646d41
-	i[34567]86v32)
646d41
+	i*86v32)
646d41
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
646d41
 		os=-sysv32
646d41
 		;;
646d41
-	i[34567]86v4*)
646d41
+	i*86v4*)
646d41
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
646d41
 		os=-sysv4
646d41
 		;;
646d41
-	i[34567]86v)
646d41
+	i*86v)
646d41
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
646d41
 		os=-sysv
646d41
 		;;
646d41
-	i[34567]86sol2)
646d41
+	i*86sol2)
646d41
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
646d41
 		os=-solaris2
646d41
 		;;
646d41
+	i386mach)
646d41
+		basic_machine=i386-mach
646d41
+		os=-mach
646d41
+		;;
646d41
+	i386-vsta | vsta)
646d41
+		basic_machine=i386-unknown
646d41
+		os=-vsta
646d41
+		;;
646d41
 	iris | iris4d)
646d41
 		basic_machine=mips-sgi
646d41
 		case $os in
646d41
@@ -385,6 +767,14 @@ case $basic_machine in
646d41
 		basic_machine=m68k-isi
646d41
 		os=-sysv
646d41
 		;;
646d41
+	m68knommu)
646d41
+		basic_machine=m68k-unknown
646d41
+		os=-linux
646d41
+		;;
646d41
+	m68knommu-*)
646d41
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		os=-linux
646d41
+		;;
646d41
 	m88k-omron*)
646d41
 		basic_machine=m88k-omron
646d41
 		;;
646d41
@@ -396,16 +786,27 @@ case $basic_machine in
646d41
 		basic_machine=ns32k-utek
646d41
 		os=-sysv
646d41
 		;;
646d41
+	microblaze*)
646d41
+		basic_machine=microblaze-xilinx
646d41
+		;;
646d41
+	mingw64)
646d41
+		basic_machine=x86_64-pc
646d41
+		os=-mingw64
646d41
+		;;
646d41
+	mingw32)
646d41
+		basic_machine=i386-pc
646d41
+		os=-mingw32
646d41
+		;;
646d41
+	mingw32ce)
646d41
+		basic_machine=arm-unknown
646d41
+		os=-mingw32ce
646d41
+		;;
646d41
 	miniframe)
646d41
 		basic_machine=m68000-convergent
646d41
 		;;
646d41
-	mipsel*-linux*)
646d41
-		basic_machine=mipsel-unknown
646d41
-		os=-linux-gnu
646d41
-		;;
646d41
-	mips*-linux*)
646d41
-		basic_machine=mips-unknown
646d41
-		os=-linux-gnu
646d41
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
646d41
+		basic_machine=m68k-atari
646d41
+		os=-mint
646d41
 		;;
646d41
 	mips3*-*)
646d41
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
646d41
@@ -413,10 +814,45 @@ case $basic_machine in
646d41
 	mips3*)
646d41
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
646d41
 		;;
646d41
+	monitor)
646d41
+		basic_machine=m68k-rom68k
646d41
+		os=-coff
646d41
+		;;
646d41
+	morphos)
646d41
+		basic_machine=powerpc-unknown
646d41
+		os=-morphos
646d41
+		;;
646d41
+	msdos)
646d41
+		basic_machine=i386-pc
646d41
+		os=-msdos
646d41
+		;;
646d41
+	ms1-*)
646d41
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
646d41
+		;;
646d41
+	msys)
646d41
+		basic_machine=i386-pc
646d41
+		os=-msys
646d41
+		;;
646d41
+	mvs)
646d41
+		basic_machine=i370-ibm
646d41
+		os=-mvs
646d41
+		;;
646d41
+	nacl)
646d41
+		basic_machine=le32-unknown
646d41
+		os=-nacl
646d41
+		;;
646d41
 	ncr3000)
646d41
 		basic_machine=i486-ncr
646d41
 		os=-sysv4
646d41
 		;;
646d41
+	netbsd386)
646d41
+		basic_machine=i386-unknown
646d41
+		os=-netbsd
646d41
+		;;
646d41
+	netwinder)
646d41
+		basic_machine=armv4l-rebel
646d41
+		os=-linux
646d41
+		;;
646d41
 	news | news700 | news800 | news900)
646d41
 		basic_machine=m68k-sony
646d41
 		os=-newsos
646d41
@@ -429,6 +865,10 @@ case $basic_machine in
646d41
 		basic_machine=mips-sony
646d41
 		os=-newsos
646d41
 		;;
646d41
+	necv70)
646d41
+		basic_machine=v70-nec
646d41
+		os=-sysv
646d41
+		;;
646d41
 	next | m*-next )
646d41
 		basic_machine=m68k-next
646d41
 		case $os in
646d41
@@ -454,9 +894,45 @@ case $basic_machine in
646d41
 		basic_machine=i960-intel
646d41
 		os=-nindy
646d41
 		;;
646d41
+	mon960)
646d41
+		basic_machine=i960-intel
646d41
+		os=-mon960
646d41
+		;;
646d41
+	nonstopux)
646d41
+		basic_machine=mips-compaq
646d41
+		os=-nonstopux
646d41
+		;;
646d41
 	np1)
646d41
 		basic_machine=np1-gould
646d41
 		;;
646d41
+	neo-tandem)
646d41
+		basic_machine=neo-tandem
646d41
+		;;
646d41
+	nse-tandem)
646d41
+		basic_machine=nse-tandem
646d41
+		;;
646d41
+	nsr-tandem)
646d41
+		basic_machine=nsr-tandem
646d41
+		;;
646d41
+	op50n-* | op60c-*)
646d41
+		basic_machine=hppa1.1-oki
646d41
+		os=-proelf
646d41
+		;;
646d41
+	openrisc | openrisc-*)
646d41
+		basic_machine=or32-unknown
646d41
+		;;
646d41
+	os400)
646d41
+		basic_machine=powerpc-ibm
646d41
+		os=-os400
646d41
+		;;
646d41
+	OSE68000 | ose68000)
646d41
+		basic_machine=m68000-ericsson
646d41
+		os=-ose
646d41
+		;;
646d41
+	os68k)
646d41
+		basic_machine=m68k-none
646d41
+		os=-os68k
646d41
+		;;
646d41
 	pa-hitachi)
646d41
 		basic_machine=hppa1.1-hitachi
646d41
 		os=-hiuxwe2
646d41
@@ -465,8 +941,13 @@ case $basic_machine in
646d41
 		basic_machine=i860-intel
646d41
 		os=-osf
646d41
 		;;
646d41
-	parisc-unknown)
646d41
-		basic_machine=parisc-unknown
646d41
+	parisc)
646d41
+		basic_machine=hppa-unknown
646d41
+		os=-linux
646d41
+		;;
646d41
+	parisc-*)
646d41
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		os=-linux
646d41
 		;;
646d41
 	pbd)
646d41
 		basic_machine=sparc-tti
646d41
@@ -474,45 +955,84 @@ case $basic_machine in
646d41
 	pbb)
646d41
 		basic_machine=m68k-tti
646d41
 		;;
646d41
-        pc532 | pc532-*)
646d41
+	pc532 | pc532-*)
646d41
 		basic_machine=ns32k-pc532
646d41
 		;;
646d41
-	pentium | p5 | k5 | nexen)
646d41
+	pc98)
646d41
+		basic_machine=i386-pc
646d41
+		;;
646d41
+	pc98-*)
646d41
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		;;
646d41
+	pentium | p5 | k5 | k6 | nexgen | viac3)
646d41
 		basic_machine=i586-pc
646d41
 		;;
646d41
-	pentiumpro | p6 | k6 | 6x86)
646d41
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
646d41
 		basic_machine=i686-pc
646d41
 		;;
646d41
-	pentiumii | pentium2)
646d41
+	pentiumii | pentium2 | pentiumiii | pentium3)
646d41
+		basic_machine=i686-pc
646d41
+		;;
646d41
+	pentium4)
646d41
 		basic_machine=i786-pc
646d41
 		;;
646d41
-	pentium-* | p5-* | k5-* | nexen-*)
646d41
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
646d41
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
 		;;
646d41
-	pentiumpro-* | p6-* | k6-* | 6x86-*)
646d41
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
646d41
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		;;
646d41
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
646d41
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
 		;;
646d41
-	pentiumii-* | pentium2-*)
646d41
+	pentium4-*)
646d41
 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
 		;;
646d41
 	pn)
646d41
 		basic_machine=pn-gould
646d41
 		;;
646d41
-	power)	basic_machine=rs6000-ibm
646d41
+	power)	basic_machine=power-ibm
646d41
+		;;
646d41
+	ppc | ppcbe)	basic_machine=powerpc-unknown
646d41
 		;;
646d41
-	ppc)	basic_machine=powerpc-unknown
646d41
-	        ;;
646d41
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+	ppc-* | ppcbe-*)
646d41
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
 		;;
646d41
 	ppcle | powerpclittle | ppc-le | powerpc-little)
646d41
 		basic_machine=powerpcle-unknown
646d41
-	        ;;
646d41
+		;;
646d41
 	ppcle-* | powerpclittle-*)
646d41
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
 		;;
646d41
+	ppc64)	basic_machine=powerpc64-unknown
646d41
+		;;
646d41
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		;;
646d41
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
646d41
+		basic_machine=powerpc64le-unknown
646d41
+		;;
646d41
+	ppc64le-* | powerpc64little-*)
646d41
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		;;
646d41
 	ps2)
646d41
 		basic_machine=i386-ibm
646d41
 		;;
646d41
+	pw32)
646d41
+		basic_machine=i586-unknown
646d41
+		os=-pw32
646d41
+		;;
646d41
+	rdos | rdos64)
646d41
+		basic_machine=x86_64-pc
646d41
+		os=-rdos
646d41
+		;;
646d41
+	rdos32)
646d41
+		basic_machine=i386-pc
646d41
+		os=-rdos
646d41
+		;;
646d41
+	rom68k)
646d41
+		basic_machine=m68k-rom68k
646d41
+		os=-coff
646d41
+		;;
646d41
 	rm[46]00)
646d41
 		basic_machine=mips-siemens
646d41
 		;;
646d41
@@ -525,6 +1045,24 @@ case $basic_machine in
646d41
 	s390x | s390x-*)
646d41
 		basic_machine=s390x-ibm
646d41
 		;;
646d41
+	sa29200)
646d41
+		basic_machine=a29k-amd
646d41
+		os=-udi
646d41
+		;;
646d41
+	sb1)
646d41
+		basic_machine=mipsisa64sb1-unknown
646d41
+		;;
646d41
+	sb1el)
646d41
+		basic_machine=mipsisa64sb1el-unknown
646d41
+		;;
646d41
+	sde)
646d41
+		basic_machine=mipsisa32-sde
646d41
+		os=-elf
646d41
+		;;
646d41
+	sei)
646d41
+		basic_machine=mips-sei
646d41
+		os=-seiux
646d41
+		;;
646d41
 	sequent)
646d41
 		basic_machine=i386-sequent
646d41
 		;;
646d41
@@ -532,6 +1070,16 @@ case $basic_machine in
646d41
 		basic_machine=sh-hitachi
646d41
 		os=-hms
646d41
 		;;
646d41
+	sh5el)
646d41
+		basic_machine=sh5le-unknown
646d41
+		;;
646d41
+	sh64)
646d41
+		basic_machine=sh64-unknown
646d41
+		;;
646d41
+	sparclite-wrs | simso-wrs)
646d41
+		basic_machine=sparclite-wrs
646d41
+		os=-vxworks
646d41
+		;;
646d41
 	sps7)
646d41
 		basic_machine=m68k-bull
646d41
 		os=-sysv2
646d41
@@ -539,6 +1087,16 @@ case $basic_machine in
646d41
 	spur)
646d41
 		basic_machine=spur-unknown
646d41
 		;;
646d41
+	st2000)
646d41
+		basic_machine=m68k-tandem
646d41
+		;;
646d41
+	stratus)
646d41
+		basic_machine=i860-stratus
646d41
+		os=-sysv4
646d41
+		;;
646d41
+	strongarm-* | thumb-*)
646d41
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
646d41
+		;;
646d41
 	sun2)
646d41
 		basic_machine=m68000-sun
646d41
 		;;
646d41
@@ -579,19 +1137,43 @@ case $basic_machine in
646d41
 	sun386 | sun386i | roadrunner)
646d41
 		basic_machine=i386-sun
646d41
 		;;
646d41
+	sv1)
646d41
+		basic_machine=sv1-cray
646d41
+		os=-unicos
646d41
+		;;
646d41
 	symmetry)
646d41
 		basic_machine=i386-sequent
646d41
 		os=-dynix
646d41
 		;;
646d41
+	t3e)
646d41
+		basic_machine=alphaev5-cray
646d41
+		os=-unicos
646d41
+		;;
646d41
+	t90)
646d41
+		basic_machine=t90-cray
646d41
+		os=-unicos
646d41
+		;;
646d41
+	tile*)
646d41
+		basic_machine=$basic_machine-unknown
646d41
+		os=-linux-gnu
646d41
+		;;
646d41
 	tx39)
646d41
 		basic_machine=mipstx39-unknown
646d41
 		;;
646d41
 	tx39el)
646d41
 		basic_machine=mipstx39el-unknown
646d41
 		;;
646d41
+	toad1)
646d41
+		basic_machine=pdp10-xkl
646d41
+		os=-tops20
646d41
+		;;
646d41
 	tower | tower-32)
646d41
 		basic_machine=m68k-ncr
646d41
 		;;
646d41
+	tpf)
646d41
+		basic_machine=s390x-ibm
646d41
+		os=-tpf
646d41
+		;;
646d41
 	udi29k)
646d41
 		basic_machine=a29k-amd
646d41
 		os=-udi
646d41
@@ -600,6 +1182,10 @@ case $basic_machine in
646d41
 		basic_machine=a29k-nyu
646d41
 		os=-sym1
646d41
 		;;
646d41
+	v810 | necv810)
646d41
+		basic_machine=v810-nec
646d41
+		os=-none
646d41
+		;;
646d41
 	vaxv)
646d41
 		basic_machine=vax-dec
646d41
 		os=-sysv
646d41
@@ -609,8 +1195,8 @@ case $basic_machine in
646d41
 		os=-vms
646d41
 		;;
646d41
 	vpp*|vx|vx-*)
646d41
-               basic_machine=f301-fujitsu
646d41
-               ;;
646d41
+		basic_machine=f301-fujitsu
646d41
+		;;
646d41
 	vxworks960)
646d41
 		basic_machine=i960-wrs
646d41
 		os=-vxworks
646d41
@@ -623,13 +1209,36 @@ case $basic_machine in
646d41
 		basic_machine=a29k-wrs
646d41
 		os=-vxworks
646d41
 		;;
646d41
-	xmp)
646d41
-		basic_machine=xmp-cray
646d41
-		os=-unicos
646d41
+	w65*)
646d41
+		basic_machine=w65-wdc
646d41
+		os=-none
646d41
+		;;
646d41
+	w89k-*)
646d41
+		basic_machine=hppa1.1-winbond
646d41
+		os=-proelf
646d41
 		;;
646d41
-        xps | xps100)
646d41
+	xbox)
646d41
+		basic_machine=i686-pc
646d41
+		os=-mingw32
646d41
+		;;
646d41
+	xps | xps100)
646d41
 		basic_machine=xps100-honeywell
646d41
 		;;
646d41
+	xscale-* | xscalee[bl]-*)
646d41
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
646d41
+		;;
646d41
+	ymp)
646d41
+		basic_machine=ymp-cray
646d41
+		os=-unicos
646d41
+		;;
646d41
+	z8k-*-coff)
646d41
+		basic_machine=z8k-unknown
646d41
+		os=-sim
646d41
+		;;
646d41
+	z80-*-coff)
646d41
+		basic_machine=z80-unknown
646d41
+		os=-sim
646d41
+		;;
646d41
 	none)
646d41
 		basic_machine=none-none
646d41
 		os=-none
646d41
@@ -637,32 +1246,44 @@ case $basic_machine in
646d41
 
646d41
 # Here we handle the default manufacturer of certain CPU types.  It is in
646d41
 # some cases the only manufacturer, in others, it is the most popular.
646d41
-	mips)
646d41
-		if [ x$os = x-linux-gnu ]; then
646d41
-			basic_machine=mips-unknown
646d41
-		else
646d41
-			basic_machine=mips-mips
646d41
-		fi
646d41
+	w89k)
646d41
+		basic_machine=hppa1.1-winbond
646d41
+		;;
646d41
+	op50n)
646d41
+		basic_machine=hppa1.1-oki
646d41
+		;;
646d41
+	op60c)
646d41
+		basic_machine=hppa1.1-oki
646d41
 		;;
646d41
 	romp)
646d41
 		basic_machine=romp-ibm
646d41
 		;;
646d41
+	mmix)
646d41
+		basic_machine=mmix-knuth
646d41
+		;;
646d41
 	rs6000)
646d41
 		basic_machine=rs6000-ibm
646d41
 		;;
646d41
 	vax)
646d41
 		basic_machine=vax-dec
646d41
 		;;
646d41
+	pdp10)
646d41
+		# there are many clones, so DEC is not a safe bet
646d41
+		basic_machine=pdp10-unknown
646d41
+		;;
646d41
 	pdp11)
646d41
 		basic_machine=pdp11-dec
646d41
 		;;
646d41
 	we32k)
646d41
 		basic_machine=we32k-att
646d41
 		;;
646d41
-	sparc)
646d41
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
646d41
+		basic_machine=sh-unknown
646d41
+		;;
646d41
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
646d41
 		basic_machine=sparc-sun
646d41
 		;;
646d41
-        cydra)
646d41
+	cydra)
646d41
 		basic_machine=cydra-cydrome
646d41
 		;;
646d41
 	orion)
646d41
@@ -671,6 +1292,15 @@ case $basic_machine in
646d41
 	orion105)
646d41
 		basic_machine=clipper-highlevel
646d41
 		;;
646d41
+	mac | mpw | mac-mpw)
646d41
+		basic_machine=m68k-apple
646d41
+		;;
646d41
+	pmac | pmac-mpw)
646d41
+		basic_machine=powerpc-apple
646d41
+		;;
646d41
+	*-unknown)
646d41
+		# Make sure to match an already-canonicalized machine name.
646d41
+		;;
646d41
 	*)
646d41
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
646d41
 		exit 1
646d41
@@ -694,9 +1324,12 @@ esac
646d41
 if [ x"$os" != x"" ]
646d41
 then
646d41
 case $os in
646d41
-        # First match some system type aliases
646d41
-        # that might get confused with valid system types.
646d41
+	# First match some system type aliases
646d41
+	# that might get confused with valid system types.
646d41
 	# -solaris* is a basic system type, with this one exception.
646d41
+	-auroraux)
646d41
+		os=-auroraux
646d41
+		;;
646d41
 	-solaris1 | -solaris1.*)
646d41
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
646d41
 		;;
646d41
@@ -717,21 +1350,57 @@ case $os in
646d41
 	# Each alternative MUST END IN A *, to match a version number.
646d41
 	# -sysv* is not here because it comes later, after sysvr4.
646d41
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
646d41
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
646d41
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
646d41
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
646d41
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
646d41
+	      | -sym* | -kopensolaris* | -plan9* \
646d41
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
646d41
-	      | -aos* \
646d41
+	      | -aos* | -aros* \
646d41
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
646d41
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
646d41
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -dragonfly* | -riscix* \
646d41
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
646d41
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
646d41
+	      | -bitrig* | -openbsd* | -solidbsd* \
646d41
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
646d41
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
646d41
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
646d41
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
646d41
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
646d41
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -os2* \
646d41
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -macos* | -haiku* )
646d41
+	      | -chorusos* | -chorusrdb* | -cegcc* \
646d41
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
646d41
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
646d41
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
646d41
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
646d41
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
646d41
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
646d41
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
646d41
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
646d41
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
646d41
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
646d41
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
646d41
 	# Remember, each alternative MUST END IN *, to match a version number.
646d41
 		;;
646d41
+	-qnx*)
646d41
+		case $basic_machine in
646d41
+		    x86-* | i*86-*)
646d41
+			;;
646d41
+		    *)
646d41
+			os=-nto$os
646d41
+			;;
646d41
+		esac
646d41
+		;;
646d41
+	-nto-qnx*)
646d41
+		;;
646d41
+	-nto*)
646d41
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
646d41
+		;;
646d41
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
646d41
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
646d41
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
646d41
+		;;
646d41
+	-mac*)
646d41
+		os=`echo $os | sed -e 's|mac|macos|'`
646d41
+		;;
646d41
+	-linux-dietlibc)
646d41
+		os=-linux-dietlibc
646d41
+		;;
646d41
 	-linux*)
646d41
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
646d41
 		;;
646d41
@@ -741,6 +1410,15 @@ case $os in
646d41
 	-sunos6*)
646d41
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
646d41
 		;;
646d41
+	-opened*)
646d41
+		os=-openedition
646d41
+		;;
646d41
+	-os400*)
646d41
+		os=-os400
646d41
+		;;
646d41
+	-wince*)
646d41
+		os=-wince
646d41
+		;;
646d41
 	-osfrose*)
646d41
 		os=-osfrose
646d41
 		;;
646d41
@@ -756,11 +1434,26 @@ case $os in
646d41
 	-acis*)
646d41
 		os=-aos
646d41
 		;;
646d41
+	-atheos*)
646d41
+		os=-atheos
646d41
+		;;
646d41
+	-syllable*)
646d41
+		os=-syllable
646d41
+		;;
646d41
+	-386bsd)
646d41
+		os=-bsd
646d41
+		;;
646d41
 	-ctix* | -uts*)
646d41
 		os=-sysv
646d41
 		;;
646d41
+	-nova*)
646d41
+		os=-rtmk-nova
646d41
+		;;
646d41
 	-ns2 )
646d41
-	        os=-nextstep2
646d41
+		os=-nextstep2
646d41
+		;;
646d41
+	-nsk*)
646d41
+		os=-nsk
646d41
 		;;
646d41
 	# Preserve the version number of sinix5.
646d41
 	-sinix5.*)
646d41
@@ -769,6 +1462,9 @@ case $os in
646d41
 	-sinix*)
646d41
 		os=-sysv4
646d41
 		;;
646d41
+	-tpf*)
646d41
+		os=-tpf
646d41
+		;;
646d41
 	-triton*)
646d41
 		os=-sysv3
646d41
 		;;
646d41
@@ -781,29 +1477,35 @@ case $os in
646d41
 	-svr3)
646d41
 		os=-sysv3
646d41
 		;;
646d41
-	# For sys5.3 apollo
646d41
-	-sys5.3)
646d41
-		os=-sysv3
646d41
-		;;
646d41
 	-sysvr4)
646d41
 		os=-sysv4
646d41
 		;;
646d41
 	# This must come after -sysvr4.
646d41
 	-sysv*)
646d41
 		;;
646d41
+	-ose*)
646d41
+		os=-ose
646d41
+		;;
646d41
+	-es1800*)
646d41
+		os=-ose
646d41
+		;;
646d41
 	-xenix)
646d41
 		os=-xenix
646d41
 		;;
646d41
-	-freemint)
646d41
-		os=-freemint
646d41
-		;;
646d41
-	-mint)
646d41
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
646d41
 		os=-mint
646d41
 		;;
646d41
-	-tos)
646d41
-		os=-tos
646d41
+	-aros*)
646d41
+		os=-aros
646d41
+		;;
646d41
+	-zvmoe)
646d41
+		os=-zvmoe
646d41
+		;;
646d41
+	-dicos*)
646d41
+		os=-dicos
646d41
+		;;
646d41
+	-nacl*)
646d41
 		;;
646d41
-
646d41
 	-none)
646d41
 		;;
646d41
 	*)
646d41
@@ -826,13 +1528,41 @@ else
646d41
 # system, and we'll never get to this point.
646d41
 
646d41
 case $basic_machine in
646d41
+	score-*)
646d41
+		os=-elf
646d41
+		;;
646d41
+	spu-*)
646d41
+		os=-elf
646d41
+		;;
646d41
 	*-acorn)
646d41
 		os=-riscix1.2
646d41
 		;;
646d41
+	arm*-rebel)
646d41
+		os=-linux
646d41
+		;;
646d41
 	arm*-semi)
646d41
 		os=-aout
646d41
 		;;
646d41
-        pdp11-*)
646d41
+	c4x-* | tic4x-*)
646d41
+		os=-coff
646d41
+		;;
646d41
+	hexagon-*)
646d41
+		os=-elf
646d41
+		;;
646d41
+	tic54x-*)
646d41
+		os=-coff
646d41
+		;;
646d41
+	tic55x-*)
646d41
+		os=-coff
646d41
+		;;
646d41
+	tic6x-*)
646d41
+		os=-coff
646d41
+		;;
646d41
+	# This must come before the *-dec entry.
646d41
+	pdp10-*)
646d41
+		os=-tops20
646d41
+		;;
646d41
+	pdp11-*)
646d41
 		os=-none
646d41
 		;;
646d41
 	*-dec | vax-*)
646d41
@@ -846,9 +1576,24 @@ case $basic_machine in
646d41
 		;;
646d41
 	m68000-sun)
646d41
 		os=-sunos3
646d41
-		# This also exists in the configure program, but was not the
646d41
-		# default.
646d41
-		# os=-sunos4
646d41
+		;;
646d41
+	m68*-cisco)
646d41
+		os=-aout
646d41
+		;;
646d41
+	mep-*)
646d41
+		os=-elf
646d41
+		;;
646d41
+	mips*-cisco)
646d41
+		os=-elf
646d41
+		;;
646d41
+	mips*-*)
646d41
+		os=-elf
646d41
+		;;
646d41
+	or1k-*)
646d41
+		os=-elf
646d41
+		;;
646d41
+	or32-*)
646d41
+		os=-coff
646d41
 		;;
646d41
 	*-tti)	# must be before sparc entry or we get the wrong os.
646d41
 		os=-sysv3
646d41
@@ -865,6 +1610,18 @@ case $basic_machine in
646d41
 	*-ibm)
646d41
 		os=-aix
646d41
 		;;
646d41
+	*-knuth)
646d41
+		os=-mmixware
646d41
+		;;
646d41
+	*-wec)
646d41
+		os=-proelf
646d41
+		;;
646d41
+	*-winbond)
646d41
+		os=-proelf
646d41
+		;;
646d41
+	*-oki)
646d41
+		os=-proelf
646d41
+		;;
646d41
 	*-hp)
646d41
 		os=-hpux
646d41
 		;;
646d41
@@ -907,27 +1664,39 @@ case $basic_machine in
646d41
 	*-next)
646d41
 		os=-nextstep3
646d41
 		;;
646d41
-        *-gould)
646d41
+	*-gould)
646d41
 		os=-sysv
646d41
 		;;
646d41
-        *-highlevel)
646d41
+	*-highlevel)
646d41
 		os=-bsd
646d41
 		;;
646d41
 	*-encore)
646d41
 		os=-bsd
646d41
 		;;
646d41
-        *-sgi)
646d41
+	*-sgi)
646d41
 		os=-irix
646d41
 		;;
646d41
-        *-siemens)
646d41
+	*-siemens)
646d41
 		os=-sysv4
646d41
 		;;
646d41
 	*-masscomp)
646d41
 		os=-rtu
646d41
 		;;
646d41
-	f301-fujitsu)
646d41
+	f30[01]-fujitsu | f700-fujitsu)
646d41
 		os=-uxpv
646d41
 		;;
646d41
+	*-rom68k)
646d41
+		os=-coff
646d41
+		;;
646d41
+	*-*bug)
646d41
+		os=-coff
646d41
+		;;
646d41
+	*-apple)
646d41
+		os=-macos
646d41
+		;;
646d41
+	*-atari*)
646d41
+		os=-mint
646d41
+		;;
646d41
 	*)
646d41
 		os=-none
646d41
 		;;
646d41
@@ -946,12 +1715,18 @@ case $basic_machine in
646d41
 			-sunos*)
646d41
 				vendor=sun
646d41
 				;;
646d41
-			-aix*)
646d41
+			-cnk*|-aix*)
646d41
 				vendor=ibm
646d41
 				;;
646d41
+			-beos*)
646d41
+				vendor=be
646d41
+				;;
646d41
 			-hpux*)
646d41
 				vendor=hp
646d41
 				;;
646d41
+			-mpeix*)
646d41
+				vendor=hp
646d41
+				;;
646d41
 			-hiux*)
646d41
 				vendor=hitachi
646d41
 				;;
646d41
@@ -967,21 +1742,47 @@ case $basic_machine in
646d41
 			-genix*)
646d41
 				vendor=ns
646d41
 				;;
646d41
-			-mvs*)
646d41
+			-mvs* | -opened*)
646d41
+				vendor=ibm
646d41
+				;;
646d41
+			-os400*)
646d41
 				vendor=ibm
646d41
 				;;
646d41
 			-ptx*)
646d41
 				vendor=sequent
646d41
 				;;
646d41
-			-vxsim* | -vxworks*)
646d41
+			-tpf*)
646d41
+				vendor=ibm
646d41
+				;;
646d41
+			-vxsim* | -vxworks* | -windiss*)
646d41
 				vendor=wrs
646d41
 				;;
646d41
 			-aux*)
646d41
 				vendor=apple
646d41
 				;;
646d41
+			-hms*)
646d41
+				vendor=hitachi
646d41
+				;;
646d41
+			-mpw* | -macos*)
646d41
+				vendor=apple
646d41
+				;;
646d41
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
646d41
+				vendor=atari
646d41
+				;;
646d41
+			-vos*)
646d41
+				vendor=stratus
646d41
+				;;
646d41
 		esac
646d41
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
646d41
 		;;
646d41
 esac
646d41
 
646d41
 echo $basic_machine$os
646d41
+exit
646d41
+
646d41
+# Local variables:
646d41
+# eval: (add-hook 'write-file-hooks 'time-stamp)
646d41
+# time-stamp-start: "timestamp='"
646d41
+# time-stamp-format: "%:y-%02m-%02d"
646d41
+# time-stamp-end: "'"
646d41
+# End: