429d69
diff -up a2ps-4.14/auxdir/config.guess.aarch64 a2ps-4.14/auxdir/config.guess
429d69
--- a2ps-4.14/auxdir/config.guess.aarch64	2007-12-29 03:28:06.000000000 +0000
429d69
+++ a2ps-4.14/auxdir/config.guess	2013-04-29 13:13:51.035686658 +0100
429d69
@@ -1,10 +1,10 @@
429d69
 #! /bin/sh
429d69
 # Attempt to guess a canonical system name.
429d69
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
429d69
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
429d69
-#   Inc.
429d69
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
429d69
+#   2011, 2012 Free Software Foundation, Inc.
429d69
 
429d69
-timestamp='2007-07-22'
429d69
+timestamp='2012-09-25'
429d69
 
429d69
 # This file is free software; you can redistribute it and/or modify it
429d69
 # under the terms of the GNU General Public License as published by
429d69
@@ -17,9 +17,7 @@ timestamp='2007-07-22'
429d69
 # General Public License for more details.
429d69
 #
429d69
 # You should have received a copy of the GNU General Public License
429d69
-# along with this program; if not, write to the Free Software
429d69
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
429d69
-# 02110-1301, USA.
429d69
+# along with this program; if not, see <http: www.gnu.org="" licenses=""/>.
429d69
 #
429d69
 # As a special exception to the GNU General Public License, if you
429d69
 # distribute this file as part of a program that contains a
429d69
@@ -27,16 +25,16 @@ timestamp='2007-07-22'
429d69
 # the same distribution terms that you use for the rest of that program.
429d69
 
429d69
 
429d69
-# Originally written by Per Bothner <per@bothner.com>.
429d69
-# Please send patches to <config-patches@gnu.org>.  Submit a context
429d69
-# diff and a properly formatted ChangeLog entry.
429d69
+# Originally written by Per Bothner.  Please send patches (context
429d69
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
429d69
+# entry.
429d69
 #
429d69
 # This script attempts to guess a canonical system name similar to
429d69
 # config.sub.  If it succeeds, it prints the system name on stdout, and
429d69
 # exits with 0.  Otherwise, it exits with 1.
429d69
 #
429d69
-# The plan is that this can be called by configure scripts if you
429d69
-# don't specify an explicit build system type.
429d69
+# You can get the latest version of this script from:
429d69
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
429d69
 
429d69
 me=`echo "$0" | sed -e 's,.*/,,'`
429d69
 
429d69
@@ -56,7 +54,8 @@ version="\
429d69
 GNU config.guess ($timestamp)
429d69
 
429d69
 Originally written by Per Bothner.
429d69
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
429d69
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
429d69
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
429d69
 Free Software Foundation, Inc.
429d69
 
429d69
 This is free software; see the source for copying conditions.  There is NO
429d69
@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` |
429d69
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
429d69
     *:NetBSD:*:*)
429d69
 	# NetBSD (nbsd) targets should (where applicable) match one or
429d69
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
429d69
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
429d69
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
429d69
 	# switched to ELF, *-*-netbsd* would select the old
429d69
 	# object file format.  This provides both forward
429d69
@@ -170,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
429d69
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
429d69
 		eval $set_cc_for_build
429d69
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
429d69
-			| grep __ELF__ >/dev/null
429d69
+			| grep -q __ELF__
429d69
 		then
429d69
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
429d69
 		    # Return netbsd for either.  FIX?
429d69
@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
429d69
 		fi
429d69
 		;;
429d69
 	    *)
429d69
-	        os=netbsd
429d69
+		os=netbsd
429d69
 		;;
429d69
 	esac
429d69
 	# The OS release
429d69
@@ -201,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
429d69
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
429d69
 	echo "${machine}-${os}${release}"
429d69
 	exit ;;
429d69
+    *:Bitrig:*:*)
429d69
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
429d69
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
429d69
+	exit ;;
429d69
     *:OpenBSD:*:*)
429d69
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
429d69
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
429d69
@@ -223,7 +226,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
429d69
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
429d69
 		;;
429d69
 	*5.*)
429d69
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
429d69
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
429d69
 		;;
429d69
 	esac
429d69
 	# According to Compaq, /usr/sbin/psrinfo has been available on
429d69
@@ -269,7 +272,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
429d69
 	# A Xn.n version is an unreleased experimental baselevel.
429d69
 	# 1.2 uses "1.2" for uname -r.
429d69
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
429d69
-	exit ;;
429d69
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
429d69
+	exitcode=$?
429d69
+	trap '' 0
429d69
+	exit $exitcode ;;
429d69
     Alpha\ *:Windows_NT*:*)
429d69
 	# How do we know it's Interix rather than the generic POSIX subsystem?
429d69
 	# Should we change UNAME_MACHINE based on the output of uname instead
429d69
@@ -295,12 +301,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
429d69
 	echo s390-ibm-zvmoe
429d69
 	exit ;;
429d69
     *:OS400:*:*)
429d69
-        echo powerpc-ibm-os400
429d69
+	echo powerpc-ibm-os400
429d69
 	exit ;;
429d69
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
429d69
 	echo arm-acorn-riscix${UNAME_RELEASE}
429d69
 	exit ;;
429d69
-    arm:riscos:*:*|arm:RISCOS:*:*)
429d69
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
429d69
 	echo arm-unknown-riscos
429d69
 	exit ;;
429d69
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
429d69
@@ -324,14 +330,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
429d69
 	case `/usr/bin/uname -p` in
429d69
 	    sparc) echo sparc-icl-nx7; exit ;;
429d69
 	esac ;;
429d69
+    s390x:SunOS:*:*)
429d69
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
429d69
+	exit ;;
429d69
     sun4H:SunOS:5.*:*)
429d69
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
429d69
 	exit ;;
429d69
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
429d69
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
429d69
 	exit ;;
429d69
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
429d69
+	echo i386-pc-auroraux${UNAME_RELEASE}
429d69
+	exit ;;
429d69
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
429d69
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
429d69
+	eval $set_cc_for_build
429d69
+	SUN_ARCH="i386"
429d69
+	# If there is a compiler, see if it is configured for 64-bit objects.
429d69
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
429d69
+	# This test works for both compilers.
429d69
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
429d69
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
429d69
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
429d69
+		grep IS_64BIT_ARCH >/dev/null
429d69
+	    then
429d69
+		SUN_ARCH="x86_64"
429d69
+	    fi
429d69
+	fi
429d69
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
429d69
 	exit ;;
429d69
     sun4*:SunOS:6*:*)
429d69
 	# According to config.sub, this is the proper way to canonicalize
429d69
@@ -375,23 +400,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
429d69
     # MiNT.  But MiNT is downward compatible to TOS, so this should
429d69
     # be no problem.
429d69
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
429d69
-        echo m68k-atari-mint${UNAME_RELEASE}
429d69
+	echo m68k-atari-mint${UNAME_RELEASE}
429d69
 	exit ;;
429d69
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
429d69
 	echo m68k-atari-mint${UNAME_RELEASE}
429d69
-        exit ;;
429d69
+	exit ;;
429d69
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
429d69
-        echo m68k-atari-mint${UNAME_RELEASE}
429d69
+	echo m68k-atari-mint${UNAME_RELEASE}
429d69
 	exit ;;
429d69
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
429d69
-        echo m68k-milan-mint${UNAME_RELEASE}
429d69
-        exit ;;
429d69
+	echo m68k-milan-mint${UNAME_RELEASE}
429d69
+	exit ;;
429d69
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
429d69
-        echo m68k-hades-mint${UNAME_RELEASE}
429d69
-        exit ;;
429d69
+	echo m68k-hades-mint${UNAME_RELEASE}
429d69
+	exit ;;
429d69
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
429d69
-        echo m68k-unknown-mint${UNAME_RELEASE}
429d69
-        exit ;;
429d69
+	echo m68k-unknown-mint${UNAME_RELEASE}
429d69
+	exit ;;
429d69
     m68k:machten:*:*)
429d69
 	echo m68k-apple-machten${UNAME_RELEASE}
429d69
 	exit ;;
429d69
@@ -461,8 +486,8 @@ EOF
429d69
 	echo m88k-motorola-sysv3
429d69
 	exit ;;
429d69
     AViiON:dgux:*:*)
429d69
-        # DG/UX returns AViiON for all architectures
429d69
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
429d69
+	# DG/UX returns AViiON for all architectures
429d69
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
429d69
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
429d69
 	then
429d69
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
429d69
@@ -475,7 +500,7 @@ EOF
429d69
 	else
429d69
 	    echo i586-dg-dgux${UNAME_RELEASE}
429d69
 	fi
429d69
- 	exit ;;
429d69
+	exit ;;
429d69
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
429d69
 	echo m88k-dolphin-sysv3
429d69
 	exit ;;
429d69
@@ -532,7 +557,7 @@ EOF
429d69
 		echo rs6000-ibm-aix3.2
429d69
 	fi
429d69
 	exit ;;
429d69
-    *:AIX:*:[45])
429d69
+    *:AIX:*:[4567])
429d69
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
429d69
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
429d69
 		IBM_ARCH=rs6000
429d69
@@ -575,52 +600,52 @@ EOF
429d69
 	    9000/[678][0-9][0-9])
429d69
 		if [ -x /usr/bin/getconf ]; then
429d69
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
429d69
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
429d69
-                    case "${sc_cpu_version}" in
429d69
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
429d69
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
429d69
-                      532)                      # CPU_PA_RISC2_0
429d69
-                        case "${sc_kernel_bits}" in
429d69
-                          32) HP_ARCH="hppa2.0n" ;;
429d69
-                          64) HP_ARCH="hppa2.0w" ;;
429d69
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
429d69
+		    case "${sc_cpu_version}" in
429d69
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
429d69
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
429d69
+		      532)                      # CPU_PA_RISC2_0
429d69
+			case "${sc_kernel_bits}" in
429d69
+			  32) HP_ARCH="hppa2.0n" ;;
429d69
+			  64) HP_ARCH="hppa2.0w" ;;
429d69
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
429d69
-                        esac ;;
429d69
-                    esac
429d69
+			esac ;;
429d69
+		    esac
429d69
 		fi
429d69
 		if [ "${HP_ARCH}" = "" ]; then
429d69
 		    eval $set_cc_for_build
429d69
-		    sed 's/^              //' << EOF >$dummy.c
429d69
+		    sed 's/^		//' << EOF >$dummy.c
429d69
 
429d69
-              #define _HPUX_SOURCE
429d69
-              #include <stdlib.h>
429d69
-              #include <unistd.h>
429d69
-
429d69
-              int main ()
429d69
-              {
429d69
-              #if defined(_SC_KERNEL_BITS)
429d69
-                  long bits = sysconf(_SC_KERNEL_BITS);
429d69
-              #endif
429d69
-                  long cpu  = sysconf (_SC_CPU_VERSION);
429d69
-
429d69
-                  switch (cpu)
429d69
-              	{
429d69
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
429d69
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
429d69
-              	case CPU_PA_RISC2_0:
429d69
-              #if defined(_SC_KERNEL_BITS)
429d69
-              	    switch (bits)
429d69
-              		{
429d69
-              		case 64: puts ("hppa2.0w"); break;
429d69
-              		case 32: puts ("hppa2.0n"); break;
429d69
-              		default: puts ("hppa2.0"); break;
429d69
-              		} break;
429d69
-              #else  /* !defined(_SC_KERNEL_BITS) */
429d69
-              	    puts ("hppa2.0"); break;
429d69
-              #endif
429d69
-              	default: puts ("hppa1.0"); break;
429d69
-              	}
429d69
-                  exit (0);
429d69
-              }
429d69
+		#define _HPUX_SOURCE
429d69
+		#include <stdlib.h>
429d69
+		#include <unistd.h>
429d69
+
429d69
+		int main ()
429d69
+		{
429d69
+		#if defined(_SC_KERNEL_BITS)
429d69
+		    long bits = sysconf(_SC_KERNEL_BITS);
429d69
+		#endif
429d69
+		    long cpu  = sysconf (_SC_CPU_VERSION);
429d69
+
429d69
+		    switch (cpu)
429d69
+			{
429d69
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
429d69
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
429d69
+			case CPU_PA_RISC2_0:
429d69
+		#if defined(_SC_KERNEL_BITS)
429d69
+			    switch (bits)
429d69
+				{
429d69
+				case 64: puts ("hppa2.0w"); break;
429d69
+				case 32: puts ("hppa2.0n"); break;
429d69
+				default: puts ("hppa2.0"); break;
429d69
+				} break;
429d69
+		#else  /* !defined(_SC_KERNEL_BITS) */
429d69
+			    puts ("hppa2.0"); break;
429d69
+		#endif
429d69
+			default: puts ("hppa1.0"); break;
429d69
+			}
429d69
+		    exit (0);
429d69
+		}
429d69
 EOF
429d69
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
429d69
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
429d69
@@ -640,7 +665,7 @@ EOF
429d69
 	    # => hppa64-hp-hpux11.23
429d69
 
429d69
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
429d69
-		grep __LP64__ >/dev/null
429d69
+		grep -q __LP64__
429d69
 	    then
429d69
 		HP_ARCH="hppa2.0w"
429d69
 	    else
429d69
@@ -711,22 +736,22 @@ EOF
429d69
 	exit ;;
429d69
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
429d69
 	echo c1-convex-bsd
429d69
-        exit ;;
429d69
+	exit ;;
429d69
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
429d69
 	if getsysinfo -f scalar_acc
429d69
 	then echo c32-convex-bsd
429d69
 	else echo c2-convex-bsd
429d69
 	fi
429d69
-        exit ;;
429d69
+	exit ;;
429d69
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
429d69
 	echo c34-convex-bsd
429d69
-        exit ;;
429d69
+	exit ;;
429d69
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
429d69
 	echo c38-convex-bsd
429d69
-        exit ;;
429d69
+	exit ;;
429d69
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
429d69
 	echo c4-convex-bsd
429d69
-        exit ;;
429d69
+	exit ;;
429d69
     CRAY*Y-MP:*:*:*)
429d69
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
429d69
 	exit ;;
429d69
@@ -750,14 +775,14 @@ EOF
429d69
 	exit ;;
429d69
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
429d69
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
429d69
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
429d69
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
429d69
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
429d69
-        exit ;;
429d69
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
429d69
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
429d69
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
429d69
+	exit ;;
429d69
     5000:UNIX_System_V:4.*:*)
429d69
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
429d69
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
429d69
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
429d69
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
429d69
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
429d69
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
429d69
 	exit ;;
429d69
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
429d69
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
429d69
@@ -769,40 +794,51 @@ EOF
429d69
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
429d69
 	exit ;;
429d69
     *:FreeBSD:*:*)
429d69
-	case ${UNAME_MACHINE} in
429d69
-	    pc98)
429d69
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
429d69
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
429d69
+	case ${UNAME_PROCESSOR} in
429d69
 	    amd64)
429d69
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
429d69
 	    *)
429d69
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
429d69
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
429d69
 	esac
429d69
 	exit ;;
429d69
     i*:CYGWIN*:*)
429d69
 	echo ${UNAME_MACHINE}-pc-cygwin
429d69
 	exit ;;
429d69
+    *:MINGW64*:*)
429d69
+	echo ${UNAME_MACHINE}-pc-mingw64
429d69
+	exit ;;
429d69
     *:MINGW*:*)
429d69
 	echo ${UNAME_MACHINE}-pc-mingw32
429d69
 	exit ;;
429d69
+    i*:MSYS*:*)
429d69
+	echo ${UNAME_MACHINE}-pc-msys
429d69
+	exit ;;
429d69
     i*:windows32*:*)
429d69
-    	# uname -m includes "-pc" on this system.
429d69
-    	echo ${UNAME_MACHINE}-mingw32
429d69
+	# uname -m includes "-pc" on this system.
429d69
+	echo ${UNAME_MACHINE}-mingw32
429d69
 	exit ;;
429d69
     i*:PW*:*)
429d69
 	echo ${UNAME_MACHINE}-pc-pw32
429d69
 	exit ;;
429d69
-    *:Interix*:[3456]*)
429d69
-    	case ${UNAME_MACHINE} in
429d69
+    *:Interix*:*)
429d69
+	case ${UNAME_MACHINE} in
429d69
 	    x86)
429d69
 		echo i586-pc-interix${UNAME_RELEASE}
429d69
 		exit ;;
429d69
-	    EM64T | authenticamd)
429d69
+	    authenticamd | genuineintel | EM64T)
429d69
 		echo x86_64-unknown-interix${UNAME_RELEASE}
429d69
 		exit ;;
429d69
+	    IA64)
429d69
+		echo ia64-unknown-interix${UNAME_RELEASE}
429d69
+		exit ;;
429d69
 	esac ;;
429d69
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
429d69
 	echo i${UNAME_MACHINE}-pc-mks
429d69
 	exit ;;
429d69
+    8664:Windows_NT:*)
429d69
+	echo x86_64-pc-mks
429d69
+	exit ;;
429d69
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
429d69
 	# How do we know it's Interix rather than the generic POSIX subsystem?
429d69
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
429d69
@@ -832,20 +868,68 @@ EOF
429d69
     i*86:Minix:*:*)
429d69
 	echo ${UNAME_MACHINE}-pc-minix
429d69
 	exit ;;
429d69
-    arm*:Linux:*:*)
429d69
+    aarch64:Linux:*:*)
429d69
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
 	exit ;;
429d69
+    aarch64_be:Linux:*:*)
429d69
+	UNAME_MACHINE=aarch64_be
429d69
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
+	exit ;;
429d69
+    alpha:Linux:*:*)
429d69
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
429d69
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
429d69
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
429d69
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
429d69
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
429d69
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
429d69
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
429d69
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
429d69
+	esac
429d69
+	objdump --private-headers /bin/sh | grep -q ld.so.1
429d69
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
429d69
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
429d69
+	exit ;;
429d69
+    arm*:Linux:*:*)
429d69
+	eval $set_cc_for_build
429d69
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
429d69
+	    | grep -q __ARM_EABI__
429d69
+	then
429d69
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
+	else
429d69
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
429d69
+		| grep -q __ARM_PCS_VFP
429d69
+	    then
429d69
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
429d69
+	    else
429d69
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
429d69
+	    fi
429d69
+	fi
429d69
+	exit ;;
429d69
     avr32*:Linux:*:*)
429d69
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
 	exit ;;
429d69
     cris:Linux:*:*)
429d69
-	echo cris-axis-linux-gnu
429d69
+	echo ${UNAME_MACHINE}-axis-linux-gnu
429d69
 	exit ;;
429d69
     crisv32:Linux:*:*)
429d69
-	echo crisv32-axis-linux-gnu
429d69
+	echo ${UNAME_MACHINE}-axis-linux-gnu
429d69
 	exit ;;
429d69
     frv:Linux:*:*)
429d69
-    	echo frv-unknown-linux-gnu
429d69
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
+	exit ;;
429d69
+    hexagon:Linux:*:*)
429d69
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
+	exit ;;
429d69
+    i*86:Linux:*:*)
429d69
+	LIBC=gnu
429d69
+	eval $set_cc_for_build
429d69
+	sed 's/^	//' << EOF >$dummy.c
429d69
+	#ifdef __dietlibc__
429d69
+	LIBC=dietlibc
429d69
+	#endif
429d69
+EOF
429d69
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
429d69
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
429d69
 	exit ;;
429d69
     ia64:Linux:*:*)
429d69
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
@@ -856,74 +940,33 @@ EOF
429d69
     m68*:Linux:*:*)
429d69
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
 	exit ;;
429d69
-    mips:Linux:*:*)
429d69
+    mips:Linux:*:* | mips64:Linux:*:*)
429d69
 	eval $set_cc_for_build
429d69
 	sed 's/^	//' << EOF >$dummy.c
429d69
 	#undef CPU
429d69
-	#undef mips
429d69
-	#undef mipsel
429d69
+	#undef ${UNAME_MACHINE}
429d69
+	#undef ${UNAME_MACHINE}el
429d69
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
429d69
-	CPU=mipsel
429d69
+	CPU=${UNAME_MACHINE}el
429d69
 	#else
429d69
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
429d69
-	CPU=mips
429d69
+	CPU=${UNAME_MACHINE}
429d69
 	#else
429d69
 	CPU=
429d69
 	#endif
429d69
 	#endif
429d69
 EOF
429d69
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
429d69
-	    /^CPU/{
429d69
-		s: ::g
429d69
-		p
429d69
-	    }'`"
429d69
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
429d69
-	;;
429d69
-    mips64:Linux:*:*)
429d69
-	eval $set_cc_for_build
429d69
-	sed 's/^	//' << EOF >$dummy.c
429d69
-	#undef CPU
429d69
-	#undef mips64
429d69
-	#undef mips64el
429d69
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
429d69
-	CPU=mips64el
429d69
-	#else
429d69
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
429d69
-	CPU=mips64
429d69
-	#else
429d69
-	CPU=
429d69
-	#endif
429d69
-	#endif
429d69
-EOF
429d69
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
429d69
-	    /^CPU/{
429d69
-		s: ::g
429d69
-		p
429d69
-	    }'`"
429d69
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
429d69
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
429d69
 	;;
429d69
     or32:Linux:*:*)
429d69
-	echo or32-unknown-linux-gnu
429d69
-	exit ;;
429d69
-    ppc:Linux:*:*)
429d69
-	echo powerpc-unknown-linux-gnu
429d69
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
 	exit ;;
429d69
-    ppc64:Linux:*:*)
429d69
-	echo powerpc64-unknown-linux-gnu
429d69
+    padre:Linux:*:*)
429d69
+	echo sparc-unknown-linux-gnu
429d69
 	exit ;;
429d69
-    alpha:Linux:*:*)
429d69
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
429d69
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
429d69
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
429d69
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
429d69
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
429d69
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
429d69
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
429d69
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
429d69
-        esac
429d69
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
429d69
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
429d69
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
429d69
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
429d69
+	echo hppa64-unknown-linux-gnu
429d69
 	exit ;;
429d69
     parisc:Linux:*:* | hppa:Linux:*:*)
429d69
 	# Look for CPU level
429d69
@@ -933,14 +976,17 @@ EOF
429d69
 	  *)    echo hppa-unknown-linux-gnu ;;
429d69
 	esac
429d69
 	exit ;;
429d69
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
429d69
-	echo hppa64-unknown-linux-gnu
429d69
+    ppc64:Linux:*:*)
429d69
+	echo powerpc64-unknown-linux-gnu
429d69
+	exit ;;
429d69
+    ppc:Linux:*:*)
429d69
+	echo powerpc-unknown-linux-gnu
429d69
 	exit ;;
429d69
     s390:Linux:*:* | s390x:Linux:*:*)
429d69
 	echo ${UNAME_MACHINE}-ibm-linux
429d69
 	exit ;;
429d69
     sh64*:Linux:*:*)
429d69
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
 	exit ;;
429d69
     sh*:Linux:*:*)
429d69
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
@@ -948,78 +994,18 @@ EOF
429d69
     sparc:Linux:*:* | sparc64:Linux:*:*)
429d69
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
 	exit ;;
429d69
+    tile*:Linux:*:*)
429d69
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
+	exit ;;
429d69
     vax:Linux:*:*)
429d69
 	echo ${UNAME_MACHINE}-dec-linux-gnu
429d69
 	exit ;;
429d69
     x86_64:Linux:*:*)
429d69
-	echo x86_64-unknown-linux-gnu
429d69
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
 	exit ;;
429d69
-    xtensa:Linux:*:*)
429d69
-    	echo xtensa-unknown-linux-gnu
429d69
+    xtensa*:Linux:*:*)
429d69
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
429d69
 	exit ;;
429d69
-    i*86:Linux:*:*)
429d69
-	# The BFD linker knows what the default object file format is, so
429d69
-	# first see if it will tell us. cd to the root directory to prevent
429d69
-	# problems with other programs or directories called `ld' in the path.
429d69
-	# Set LC_ALL=C to ensure ld outputs messages in English.
429d69
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
429d69
-			 | sed -ne '/supported targets:/!d
429d69
-				    s/[ 	][ 	]*/ /g
429d69
-				    s/.*supported targets: *//
429d69
-				    s/ .*//
429d69
-				    p'`
429d69
-        case "$ld_supported_targets" in
429d69
-	  elf32-i386)
429d69
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
429d69
-		;;
429d69
-	  a.out-i386-linux)
429d69
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
429d69
-		exit ;;
429d69
-	  coff-i386)
429d69
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
429d69
-		exit ;;
429d69
-	  "")
429d69
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
429d69
-		# one that does not give us useful --help.
429d69
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
429d69
-		exit ;;
429d69
-	esac
429d69
-	# Determine whether the default compiler is a.out or elf
429d69
-	eval $set_cc_for_build
429d69
-	sed 's/^	//' << EOF >$dummy.c
429d69
-	#include <features.h>
429d69
-	#ifdef __ELF__
429d69
-	# ifdef __GLIBC__
429d69
-	#  if __GLIBC__ >= 2
429d69
-	LIBC=gnu
429d69
-	#  else
429d69
-	LIBC=gnulibc1
429d69
-	#  endif
429d69
-	# else
429d69
-	LIBC=gnulibc1
429d69
-	# endif
429d69
-	#else
429d69
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
429d69
-	LIBC=gnu
429d69
-	#else
429d69
-	LIBC=gnuaout
429d69
-	#endif
429d69
-	#endif
429d69
-	#ifdef __dietlibc__
429d69
-	LIBC=dietlibc
429d69
-	#endif
429d69
-EOF
429d69
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
429d69
-	    /^LIBC/{
429d69
-		s: ::g
429d69
-		p
429d69
-	    }'`"
429d69
-	test x"${LIBC}" != x && {
429d69
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
429d69
-		exit
429d69
-	}
429d69
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
429d69
-	;;
429d69
     i*86:DYNIX/ptx:4*:*)
429d69
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
429d69
 	# earlier versions are messed up and put the nodename in both
429d69
@@ -1027,11 +1013,11 @@ EOF
429d69
 	echo i386-sequent-sysv4
429d69
 	exit ;;
429d69
     i*86:UNIX_SV:4.2MP:2.*)
429d69
-        # Unixware is an offshoot of SVR4, but it has its own version
429d69
-        # number series starting with 2...
429d69
-        # I am not positive that other SVR4 systems won't match this,
429d69
+	# Unixware is an offshoot of SVR4, but it has its own version
429d69
+	# number series starting with 2...
429d69
+	# I am not positive that other SVR4 systems won't match this,
429d69
 	# I just have to hope.  -- rms.
429d69
-        # Use sysv4.2uw... so that sysv4* matches it.
429d69
+	# Use sysv4.2uw... so that sysv4* matches it.
429d69
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
429d69
 	exit ;;
429d69
     i*86:OS/2:*:*)
429d69
@@ -1048,7 +1034,7 @@ EOF
429d69
     i*86:syllable:*:*)
429d69
 	echo ${UNAME_MACHINE}-pc-syllable
429d69
 	exit ;;
429d69
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
429d69
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
429d69
 	echo i386-unknown-lynxos${UNAME_RELEASE}
429d69
 	exit ;;
429d69
     i*86:*DOS:*:*)
429d69
@@ -1063,7 +1049,7 @@ EOF
429d69
 	fi
429d69
 	exit ;;
429d69
     i*86:*:5:[678]*)
429d69
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
429d69
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
429d69
 	case `/bin/uname -X | grep "^Machine"` in
429d69
 	    *486*)	     UNAME_MACHINE=i486 ;;
429d69
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
429d69
@@ -1091,10 +1077,13 @@ EOF
429d69
 	exit ;;
429d69
     pc:*:*:*)
429d69
 	# Left here for compatibility:
429d69
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
429d69
-        # the processor, so we play safe by assuming i386.
429d69
-	echo i386-pc-msdosdjgpp
429d69
-        exit ;;
429d69
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
429d69
+	# the processor, so we play safe by assuming i586.
429d69
+	# Note: whatever this is, it MUST be the same as what config.sub
429d69
+	# prints for the "djgpp" host, or else GDB configury will decide that
429d69
+	# this is a cross-build.
429d69
+	echo i586-pc-msdosdjgpp
429d69
+	exit ;;
429d69
     Intel:Mach:3*:*)
429d69
 	echo i386-pc-mach3
429d69
 	exit ;;
429d69
@@ -1129,8 +1118,18 @@ EOF
429d69
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
429d69
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
429d69
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
429d69
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
429d69
-          && { echo i486-ncr-sysv4; exit; } ;;
429d69
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
429d69
+	  && { echo i486-ncr-sysv4; exit; } ;;
429d69
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
429d69
+	OS_REL='.3'
429d69
+	test -r /etc/.relid \
429d69
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
429d69
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
429d69
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
429d69
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
429d69
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
429d69
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
429d69
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
429d69
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
429d69
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
429d69
 	exit ;;
429d69
@@ -1143,7 +1142,7 @@ EOF
429d69
     rs6000:LynxOS:2.*:*)
429d69
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
429d69
 	exit ;;
429d69
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
429d69
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
429d69
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
429d69
 	exit ;;
429d69
     SM[BE]S:UNIX_SV:*:*)
429d69
@@ -1163,10 +1162,10 @@ EOF
429d69
 		echo ns32k-sni-sysv
429d69
 	fi
429d69
 	exit ;;
429d69
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
429d69
-                      # says <richard.m.bartel@ccmail.census.gov>
429d69
-        echo i586-unisys-sysv4
429d69
-        exit ;;
429d69
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
429d69
+			# says <richard.m.bartel@ccmail.census.gov>
429d69
+	echo i586-unisys-sysv4
429d69
+	exit ;;
429d69
     *:UNIX_System_V:4*:FTX*)
429d69
 	# From Gerald Hewes <hewes@openmarket.com>.
429d69
 	# How about differentiating between stratus architectures? -djm
429d69
@@ -1192,11 +1191,11 @@ EOF
429d69
 	exit ;;
429d69
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
429d69
 	if [ -d /usr/nec ]; then
429d69
-	        echo mips-nec-sysv${UNAME_RELEASE}
429d69
+		echo mips-nec-sysv${UNAME_RELEASE}
429d69
 	else
429d69
-	        echo mips-unknown-sysv${UNAME_RELEASE}
429d69
+		echo mips-unknown-sysv${UNAME_RELEASE}
429d69
 	fi
429d69
-        exit ;;
429d69
+	exit ;;
429d69
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
429d69
 	echo powerpc-be-beos
429d69
 	exit ;;
429d69
@@ -1206,6 +1205,12 @@ EOF
429d69
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
429d69
 	echo i586-pc-beos
429d69
 	exit ;;
429d69
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
429d69
+	echo i586-pc-haiku
429d69
+	exit ;;
429d69
+    x86_64:Haiku:*:*)
429d69
+	echo x86_64-unknown-haiku
429d69
+	exit ;;
429d69
     SX-4:SUPER-UX:*:*)
429d69
 	echo sx4-nec-superux${UNAME_RELEASE}
429d69
 	exit ;;
429d69
@@ -1233,6 +1238,16 @@ EOF
429d69
     *:Darwin:*:*)
429d69
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
429d69
 	case $UNAME_PROCESSOR in
429d69
+	    i386)
429d69
+		eval $set_cc_for_build
429d69
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
429d69
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
429d69
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
429d69
+		      grep IS_64BIT_ARCH >/dev/null
429d69
+		  then
429d69
+		      UNAME_PROCESSOR="x86_64"
429d69
+		  fi
429d69
+		fi ;;
429d69
 	    unknown) UNAME_PROCESSOR=powerpc ;;
429d69
 	esac
429d69
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
429d69
@@ -1248,7 +1263,10 @@ EOF
429d69
     *:QNX:*:4*)
429d69
 	echo i386-pc-qnx
429d69
 	exit ;;
429d69
-    NSE-?:NONSTOP_KERNEL:*:*)
429d69
+    NEO-?:NONSTOP_KERNEL:*:*)
429d69
+	echo neo-tandem-nsk${UNAME_RELEASE}
429d69
+	exit ;;
429d69
+    NSE-*:NONSTOP_KERNEL:*:*)
429d69
 	echo nse-tandem-nsk${UNAME_RELEASE}
429d69
 	exit ;;
429d69
     NSR-?:NONSTOP_KERNEL:*:*)
429d69
@@ -1293,13 +1311,13 @@ EOF
429d69
 	echo pdp10-unknown-its
429d69
 	exit ;;
429d69
     SEI:*:*:SEIUX)
429d69
-        echo mips-sei-seiux${UNAME_RELEASE}
429d69
+	echo mips-sei-seiux${UNAME_RELEASE}
429d69
 	exit ;;
429d69
     *:DragonFly:*:*)
429d69
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
429d69
 	exit ;;
429d69
     *:*VMS:*:*)
429d69
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
429d69
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
429d69
 	case "${UNAME_MACHINE}" in
429d69
 	    A*) echo alpha-dec-vms ; exit ;;
429d69
 	    I*) echo ia64-dec-vms ; exit ;;
429d69
@@ -1314,11 +1332,14 @@ EOF
429d69
     i*86:rdos:*:*)
429d69
 	echo ${UNAME_MACHINE}-pc-rdos
429d69
 	exit ;;
429d69
+    i*86:AROS:*:*)
429d69
+	echo ${UNAME_MACHINE}-pc-aros
429d69
+	exit ;;
429d69
+    x86_64:VMkernel:*:*)
429d69
+	echo ${UNAME_MACHINE}-unknown-esx
429d69
+	exit ;;
429d69
 esac
429d69
 
429d69
-#echo '(No uname command or uname output not recognized.)' 1>&2
429d69
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
429d69
-
429d69
 eval $set_cc_for_build
429d69
 cat >$dummy.c <
429d69
 #ifdef _SEQUENT_
429d69
@@ -1336,11 +1357,11 @@ main ()
429d69
 #include <sys param.h="">
429d69
   printf ("m68k-sony-newsos%s\n",
429d69
 #ifdef NEWSOS4
429d69
-          "4"
429d69
+	"4"
429d69
 #else
429d69
-	  ""
429d69
+	""
429d69
 #endif
429d69
-         ); exit (0);
429d69
+	); exit (0);
429d69
 #endif
429d69
 #endif
429d69
 
429d69
@@ -1474,9 +1495,9 @@ This script, last modified $timestamp, h
429d69
 the operating system you are using. It is advised that you
429d69
 download the most up to date version of the config scripts from
429d69
 
429d69
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
429d69
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
429d69
 and
429d69
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
429d69
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
429d69
 
429d69
 If the version you run ($0) is already up to date, please
429d69
 send the following data and any information you think might be
429d69
diff -up a2ps-4.14/auxdir/config.sub.aarch64 a2ps-4.14/auxdir/config.sub
429d69
--- a2ps-4.14/auxdir/config.sub.aarch64	2007-12-29 03:28:06.000000000 +0000
429d69
+++ a2ps-4.14/auxdir/config.sub	2013-04-29 13:13:51.037686671 +0100
429d69
@@ -1,10 +1,10 @@
429d69
 #! /bin/sh
429d69
 # Configuration validation subroutine script.
429d69
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
429d69
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
429d69
-#   Inc.
429d69
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
429d69
+#   2011, 2012 Free Software Foundation, Inc.
429d69
 
429d69
-timestamp='2007-06-28'
429d69
+timestamp='2012-10-10'
429d69
 
429d69
 # This file is (in principle) common to ALL GNU software.
429d69
 # The presence of a machine in this file suggests that SOME GNU software
429d69
@@ -21,9 +21,7 @@ timestamp='2007-06-28'
429d69
 # GNU General Public License for more details.
429d69
 #
429d69
 # You should have received a copy of the GNU General Public License
429d69
-# along with this program; if not, write to the Free Software
429d69
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
429d69
-# 02110-1301, USA.
429d69
+# along with this program; if not, see <http: www.gnu.org="" licenses=""/>.
429d69
 #
429d69
 # As a special exception to the GNU General Public License, if you
429d69
 # distribute this file as part of a program that contains a
429d69
@@ -32,13 +30,16 @@ timestamp='2007-06-28'
429d69
 
429d69
 
429d69
 # Please send patches to <config-patches@gnu.org>.  Submit a context
429d69
-# diff and a properly formatted ChangeLog entry.
429d69
+# diff and a properly formatted GNU ChangeLog entry.
429d69
 #
429d69
 # Configuration subroutine to validate and canonicalize a configuration type.
429d69
 # Supply the specified configuration type as an argument.
429d69
 # If it is invalid, we print an error message on stderr and exit with code 1.
429d69
 # Otherwise, we print the canonical config type on stdout and succeed.
429d69
 
429d69
+# You can get the latest version of this script from:
429d69
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
429d69
+
429d69
 # This file is supposed to be the same for all GNU packages
429d69
 # and recognize all the CPU types, system types and aliases
429d69
 # that are meaningful with *any* GNU software.
429d69
@@ -72,7 +73,8 @@ Report bugs and patches to 
429d69
 version="\
429d69
 GNU config.sub ($timestamp)
429d69
 
429d69
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
429d69
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
429d69
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
429d69
 Free Software Foundation, Inc.
429d69
 
429d69
 This is free software; see the source for copying conditions.  There is NO
429d69
@@ -120,12 +122,18 @@ esac
429d69
 # Here we must recognize all the valid KERNEL-OS combinations.
429d69
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
429d69
 case $maybe_os in
429d69
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
429d69
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
429d69
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
429d69
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
429d69
+  knetbsd*-gnu* | netbsd*-gnu* | \
429d69
+  kopensolaris*-gnu* | \
429d69
   storm-chaos* | os2-emx* | rtmk-nova*)
429d69
     os=-$maybe_os
429d69
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
429d69
     ;;
429d69
+  android-linux)
429d69
+    os=-linux-android
429d69
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
429d69
+    ;;
429d69
   *)
429d69
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
429d69
     if [ $basic_machine != $1 ]
429d69
@@ -148,10 +156,13 @@ case $os in
429d69
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
429d69
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
429d69
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
429d69
-	-apple | -axis | -knuth | -cray)
429d69
+	-apple | -axis | -knuth | -cray | -microblaze*)
429d69
 		os=
429d69
 		basic_machine=$1
429d69
 		;;
429d69
+	-bluegene*)
429d69
+		os=-cnk
429d69
+		;;
429d69
 	-sim | -cisco | -oki | -wec | -winbond)
429d69
 		os=
429d69
 		basic_machine=$1
429d69
@@ -166,10 +177,10 @@ case $os in
429d69
 		os=-chorusos
429d69
 		basic_machine=$1
429d69
 		;;
429d69
- 	-chorusrdb)
429d69
- 		os=-chorusrdb
429d69
+	-chorusrdb)
429d69
+		os=-chorusrdb
429d69
 		basic_machine=$1
429d69
- 		;;
429d69
+		;;
429d69
 	-hiux*)
429d69
 		os=-hiuxwe2
429d69
 		;;
429d69
@@ -214,6 +225,12 @@ case $os in
429d69
 	-isc*)
429d69
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
429d69
 		;;
429d69
+	-lynx*178)
429d69
+		os=-lynxos178
429d69
+		;;
429d69
+	-lynx*5)
429d69
+		os=-lynxos5
429d69
+		;;
429d69
 	-lynx*)
429d69
 		os=-lynxos
429d69
 		;;
429d69
@@ -238,24 +255,32 @@ case $basic_machine in
429d69
 	# Some are omitted here because they have special meanings below.
429d69
 	1750a | 580 \
429d69
 	| a29k \
429d69
+	| aarch64 | aarch64_be \
429d69
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
429d69
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
429d69
 	| am33_2.0 \
429d69
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
429d69
+        | be32 | be64 \
429d69
 	| bfin \
429d69
 	| c4x | clipper \
429d69
 	| d10v | d30v | dlx | dsp16xx \
429d69
+	| epiphany \
429d69
 	| fido | fr30 | frv \
429d69
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
429d69
+	| hexagon \
429d69
 	| i370 | i860 | i960 | ia64 \
429d69
 	| ip2k | iq2000 \
429d69
+	| le32 | le64 \
429d69
+	| lm32 \
429d69
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
429d69
-	| maxq | mb | microblaze | mcore | mep \
429d69
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
429d69
 	| mips | mipsbe | mipseb | mipsel | mipsle \
429d69
 	| mips16 \
429d69
 	| mips64 | mips64el \
429d69
-	| mips64vr | mips64vrel \
429d69
+	| mips64octeon | mips64octeonel \
429d69
 	| mips64orion | mips64orionel \
429d69
+	| mips64r5900 | mips64r5900el \
429d69
+	| mips64vr | mips64vrel \
429d69
 	| mips64vr4100 | mips64vr4100el \
429d69
 	| mips64vr4300 | mips64vr4300el \
429d69
 	| mips64vr5000 | mips64vr5000el \
429d69
@@ -268,29 +293,42 @@ case $basic_machine in
429d69
 	| mipsisa64sr71k | mipsisa64sr71kel \
429d69
 	| mipstx39 | mipstx39el \
429d69
 	| mn10200 | mn10300 \
429d69
+	| moxie \
429d69
 	| mt \
429d69
 	| msp430 \
429d69
+	| nds32 | nds32le | nds32be \
429d69
 	| nios | nios2 \
429d69
 	| ns16k | ns32k \
429d69
+	| open8 \
429d69
 	| or32 \
429d69
 	| pdp10 | pdp11 | pj | pjl \
429d69
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
429d69
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
429d69
 	| pyramid \
429d69
+	| rl78 | rx \
429d69
 	| score \
429d69
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
429d69
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
429d69
 	| sh64 | sh64le \
429d69
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
429d69
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
429d69
-	| spu | strongarm \
429d69
-	| tahoe | thumb | tic4x | tic80 | tron \
429d69
-	| v850 | v850e \
429d69
+	| spu \
429d69
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
429d69
+	| ubicom32 \
429d69
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
429d69
 	| we32k \
429d69
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
429d69
-	| z8k)
429d69
+	| x86 | xc16x | xstormy16 | xtensa \
429d69
+	| z8k | z80)
429d69
 		basic_machine=$basic_machine-unknown
429d69
 		;;
429d69
-	m6811 | m68hc11 | m6812 | m68hc12)
429d69
-		# Motorola 68HC11/12.
429d69
+	c54x)
429d69
+		basic_machine=tic54x-unknown
429d69
+		;;
429d69
+	c55x)
429d69
+		basic_machine=tic55x-unknown
429d69
+		;;
429d69
+	c6x)
429d69
+		basic_machine=tic6x-unknown
429d69
+		;;
429d69
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
429d69
 		basic_machine=$basic_machine-unknown
429d69
 		os=-none
429d69
 		;;
429d69
@@ -300,6 +338,21 @@ case $basic_machine in
429d69
 		basic_machine=mt-unknown
429d69
 		;;
429d69
 
429d69
+	strongarm | thumb | xscale)
429d69
+		basic_machine=arm-unknown
429d69
+		;;
429d69
+	xgate)
429d69
+		basic_machine=$basic_machine-unknown
429d69
+		os=-none
429d69
+		;;
429d69
+	xscaleeb)
429d69
+		basic_machine=armeb-unknown
429d69
+		;;
429d69
+
429d69
+	xscaleel)
429d69
+		basic_machine=armel-unknown
429d69
+		;;
429d69
+
429d69
 	# We use `pc' rather than `unknown'
429d69
 	# because (1) that's what they normally are, and
429d69
 	# (2) the word "unknown" tends to confuse beginning users.
429d69
@@ -314,29 +367,37 @@ case $basic_machine in
429d69
 	# Recognize the basic CPU types with company name.
429d69
 	580-* \
429d69
 	| a29k-* \
429d69
+	| aarch64-* | aarch64_be-* \
429d69
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
429d69
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
429d69
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
429d69
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
429d69
 	| avr-* | avr32-* \
429d69
+	| be32-* | be64-* \
429d69
 	| bfin-* | bs2000-* \
429d69
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
429d69
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
429d69
 	| clipper-* | craynv-* | cydra-* \
429d69
 	| d10v-* | d30v-* | dlx-* \
429d69
 	| elxsi-* \
429d69
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
429d69
 	| h8300-* | h8500-* \
429d69
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
429d69
+	| hexagon-* \
429d69
 	| i*86-* | i860-* | i960-* | ia64-* \
429d69
 	| ip2k-* | iq2000-* \
429d69
+	| le32-* | le64-* \
429d69
+	| lm32-* \
429d69
 	| m32c-* | m32r-* | m32rle-* \
429d69
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
429d69
-	| m88110-* | m88k-* | maxq-* | mcore-* \
429d69
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
429d69
+	| microblaze-* | microblazeel-* \
429d69
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
429d69
 	| mips16-* \
429d69
 	| mips64-* | mips64el-* \
429d69
-	| mips64vr-* | mips64vrel-* \
429d69
+	| mips64octeon-* | mips64octeonel-* \
429d69
 	| mips64orion-* | mips64orionel-* \
429d69
+	| mips64r5900-* | mips64r5900el-* \
429d69
+	| mips64vr-* | mips64vrel-* \
429d69
 	| mips64vr4100-* | mips64vr4100el-* \
429d69
 	| mips64vr4300-* | mips64vr4300el-* \
429d69
 	| mips64vr5000-* | mips64vr5000el-* \
429d69
@@ -351,27 +412,36 @@ case $basic_machine in
429d69
 	| mmix-* \
429d69
 	| mt-* \
429d69
 	| msp430-* \
429d69
+	| nds32-* | nds32le-* | nds32be-* \
429d69
 	| nios-* | nios2-* \
429d69
 	| none-* | np1-* | ns16k-* | ns32k-* \
429d69
+	| open8-* \
429d69
 	| orion-* \
429d69
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
429d69
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
429d69
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
429d69
 	| pyramid-* \
429d69
-	| romp-* | rs6000-* \
429d69
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
429d69
+	| rl78-* | romp-* | rs6000-* | rx-* \
429d69
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
429d69
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
429d69
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
429d69
 	| sparclite-* \
429d69
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
429d69
-	| tahoe-* | thumb-* \
429d69
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
429d69
+	| tahoe-* \
429d69
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
429d69
+	| tile*-* \
429d69
 	| tron-* \
429d69
-	| v850-* | v850e-* | vax-* \
429d69
+	| ubicom32-* \
429d69
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
429d69
+	| vax-* \
429d69
 	| we32k-* \
429d69
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
429d69
-	| xstormy16-* | xtensa-* \
429d69
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
429d69
+	| xstormy16-* | xtensa*-* \
429d69
 	| ymp-* \
429d69
-	| z8k-*)
429d69
+	| z8k-* | z80-*)
429d69
+		;;
429d69
+	# Recognize the basic CPU types without company name, with glob match.
429d69
+	xtensa*)
429d69
+		basic_machine=$basic_machine-unknown
429d69
 		;;
429d69
 	# Recognize the various machine names and aliases which stand
429d69
 	# for a CPU type and a company and sometimes even an OS.
429d69
@@ -389,7 +459,7 @@ case $basic_machine in
429d69
 		basic_machine=a29k-amd
429d69
 		os=-udi
429d69
 		;;
429d69
-    	abacus)
429d69
+	abacus)
429d69
 		basic_machine=abacus-unknown
429d69
 		;;
429d69
 	adobe68k)
429d69
@@ -435,6 +505,10 @@ case $basic_machine in
429d69
 		basic_machine=m68k-apollo
429d69
 		os=-bsd
429d69
 		;;
429d69
+	aros)
429d69
+		basic_machine=i386-pc
429d69
+		os=-aros
429d69
+		;;
429d69
 	aux)
429d69
 		basic_machine=m68k-apple
429d69
 		os=-aux
429d69
@@ -443,10 +517,35 @@ case $basic_machine in
429d69
 		basic_machine=ns32k-sequent
429d69
 		os=-dynix
429d69
 		;;
429d69
+	blackfin)
429d69
+		basic_machine=bfin-unknown
429d69
+		os=-linux
429d69
+		;;
429d69
+	blackfin-*)
429d69
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
429d69
+		os=-linux
429d69
+		;;
429d69
+	bluegene*)
429d69
+		basic_machine=powerpc-ibm
429d69
+		os=-cnk
429d69
+		;;
429d69
+	c54x-*)
429d69
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
429d69
+		;;
429d69
+	c55x-*)
429d69
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
429d69
+		;;
429d69
+	c6x-*)
429d69
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
429d69
+		;;
429d69
 	c90)
429d69
 		basic_machine=c90-cray
429d69
 		os=-unicos
429d69
 		;;
429d69
+	cegcc)
429d69
+		basic_machine=arm-unknown
429d69
+		os=-cegcc
429d69
+		;;
429d69
 	convex-c1)
429d69
 		basic_machine=c1-convex
429d69
 		os=-bsd
429d69
@@ -475,7 +574,7 @@ case $basic_machine in
429d69
 		basic_machine=craynv-cray
429d69
 		os=-unicosmp
429d69
 		;;
429d69
-	cr16)
429d69
+	cr16 | cr16-*)
429d69
 		basic_machine=cr16-unknown
429d69
 		os=-elf
429d69
 		;;
429d69
@@ -514,6 +613,10 @@ case $basic_machine in
429d69
 		basic_machine=m88k-motorola
429d69
 		os=-sysv3
429d69
 		;;
429d69
+	dicos)
429d69
+		basic_machine=i686-pc
429d69
+		os=-dicos
429d69
+		;;
429d69
 	djgpp)
429d69
 		basic_machine=i586-pc
429d69
 		os=-msdosdjgpp
429d69
@@ -629,7 +732,6 @@ case $basic_machine in
429d69
 	i370-ibm* | ibm*)
429d69
 		basic_machine=i370-ibm
429d69
 		;;
429d69
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
429d69
 	i*86v32)
429d69
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
429d69
 		os=-sysv32
429d69
@@ -668,6 +770,14 @@ case $basic_machine in
429d69
 		basic_machine=m68k-isi
429d69
 		os=-sysv
429d69
 		;;
429d69
+	m68knommu)
429d69
+		basic_machine=m68k-unknown
429d69
+		os=-linux
429d69
+		;;
429d69
+	m68knommu-*)
429d69
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
429d69
+		os=-linux
429d69
+		;;
429d69
 	m88k-omron*)
429d69
 		basic_machine=m88k-omron
429d69
 		;;
429d69
@@ -679,6 +789,13 @@ case $basic_machine in
429d69
 		basic_machine=ns32k-utek
429d69
 		os=-sysv
429d69
 		;;
429d69
+	microblaze*)
429d69
+		basic_machine=microblaze-xilinx
429d69
+		;;
429d69
+	mingw64)
429d69
+		basic_machine=x86_64-pc
429d69
+		os=-mingw64
429d69
+		;;
429d69
 	mingw32)
429d69
 		basic_machine=i386-pc
429d69
 		os=-mingw32
429d69
@@ -715,10 +832,18 @@ case $basic_machine in
429d69
 	ms1-*)
429d69
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
429d69
 		;;
429d69
+	msys)
429d69
+		basic_machine=i386-pc
429d69
+		os=-msys
429d69
+		;;
429d69
 	mvs)
429d69
 		basic_machine=i370-ibm
429d69
 		os=-mvs
429d69
 		;;
429d69
+	nacl)
429d69
+		basic_machine=le32-unknown
429d69
+		os=-nacl
429d69
+		;;
429d69
 	ncr3000)
429d69
 		basic_machine=i486-ncr
429d69
 		os=-sysv4
429d69
@@ -783,6 +908,12 @@ case $basic_machine in
429d69
 	np1)
429d69
 		basic_machine=np1-gould
429d69
 		;;
429d69
+	neo-tandem)
429d69
+		basic_machine=neo-tandem
429d69
+		;;
429d69
+	nse-tandem)
429d69
+		basic_machine=nse-tandem
429d69
+		;;
429d69
 	nsr-tandem)
429d69
 		basic_machine=nsr-tandem
429d69
 		;;
429d69
@@ -813,6 +944,14 @@ case $basic_machine in
429d69
 		basic_machine=i860-intel
429d69
 		os=-osf
429d69
 		;;
429d69
+	parisc)
429d69
+		basic_machine=hppa-unknown
429d69
+		os=-linux
429d69
+		;;
429d69
+	parisc-*)
429d69
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
429d69
+		os=-linux
429d69
+		;;
429d69
 	pbd)
429d69
 		basic_machine=sparc-tti
429d69
 		;;
429d69
@@ -857,9 +996,10 @@ case $basic_machine in
429d69
 		;;
429d69
 	power)	basic_machine=power-ibm
429d69
 		;;
429d69
-	ppc)	basic_machine=powerpc-unknown
429d69
+	ppc | ppcbe)	basic_machine=powerpc-unknown
429d69
 		;;
429d69
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
429d69
+	ppc-* | ppcbe-*)
429d69
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
429d69
 		;;
429d69
 	ppcle | powerpclittle | ppc-le | powerpc-little)
429d69
 		basic_machine=powerpcle-unknown
429d69
@@ -953,6 +1093,9 @@ case $basic_machine in
429d69
 		basic_machine=i860-stratus
429d69
 		os=-sysv4
429d69
 		;;
429d69
+	strongarm-* | thumb-*)
429d69
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
429d69
+		;;
429d69
 	sun2)
429d69
 		basic_machine=m68000-sun
429d69
 		;;
429d69
@@ -1009,17 +1152,9 @@ case $basic_machine in
429d69
 		basic_machine=t90-cray
429d69
 		os=-unicos
429d69
 		;;
429d69
-	tic54x | c54x*)
429d69
-		basic_machine=tic54x-unknown
429d69
-		os=-coff
429d69
-		;;
429d69
-	tic55x | c55x*)
429d69
-		basic_machine=tic55x-unknown
429d69
-		os=-coff
429d69
-		;;
429d69
-	tic6x | c6x*)
429d69
-		basic_machine=tic6x-unknown
429d69
-		os=-coff
429d69
+	tile*)
429d69
+		basic_machine=$basic_machine-unknown
429d69
+		os=-linux-gnu
429d69
 		;;
429d69
 	tx39)
429d69
 		basic_machine=mipstx39-unknown
429d69
@@ -1088,6 +1223,9 @@ case $basic_machine in
429d69
 	xps | xps100)
429d69
 		basic_machine=xps100-honeywell
429d69
 		;;
429d69
+	xscale-* | xscalee[bl]-*)
429d69
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
429d69
+		;;
429d69
 	ymp)
429d69
 		basic_machine=ymp-cray
429d69
 		os=-unicos
429d69
@@ -1096,6 +1234,10 @@ case $basic_machine in
429d69
 		basic_machine=z8k-unknown
429d69
 		os=-sim
429d69
 		;;
429d69
+	z80-*-coff)
429d69
+		basic_machine=z80-unknown
429d69
+		os=-sim
429d69
+		;;
429d69
 	none)
429d69
 		basic_machine=none-none
429d69
 		os=-none
429d69
@@ -1134,7 +1276,7 @@ case $basic_machine in
429d69
 	we32k)
429d69
 		basic_machine=we32k-att
429d69
 		;;
429d69
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
429d69
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
429d69
 		basic_machine=sh-unknown
429d69
 		;;
429d69
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
429d69
@@ -1181,9 +1323,12 @@ esac
429d69
 if [ x"$os" != x"" ]
429d69
 then
429d69
 case $os in
429d69
-        # First match some system type aliases
429d69
-        # that might get confused with valid system types.
429d69
+	# First match some system type aliases
429d69
+	# that might get confused with valid system types.
429d69
 	# -solaris* is a basic system type, with this one exception.
429d69
+	-auroraux)
429d69
+		os=-auroraux
429d69
+		;;
429d69
 	-solaris1 | -solaris1.*)
429d69
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
429d69
 		;;
429d69
@@ -1204,21 +1349,23 @@ case $os in
429d69
 	# Each alternative MUST END IN A *, to match a version number.
429d69
 	# -sysv* is not here because it comes later, after sysvr4.
429d69
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
429d69
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
429d69
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
429d69
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
429d69
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
429d69
+	      | -sym* | -kopensolaris* \
429d69
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
429d69
-	      | -aos* \
429d69
+	      | -aos* | -aros* \
429d69
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
429d69
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
429d69
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
429d69
-	      | -openbsd* | -solidbsd* \
429d69
+	      | -bitrig* | -openbsd* | -solidbsd* \
429d69
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
429d69
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
429d69
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
429d69
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
429d69
-	      | -chorusos* | -chorusrdb* \
429d69
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
429d69
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
429d69
+	      | -chorusos* | -chorusrdb* | -cegcc* \
429d69
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
429d69
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
429d69
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
429d69
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
429d69
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
429d69
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
429d69
@@ -1226,7 +1373,7 @@ case $os in
429d69
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
429d69
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
429d69
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
429d69
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
429d69
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
429d69
 	# Remember, each alternative MUST END IN *, to match a version number.
429d69
 		;;
429d69
 	-qnx*)
429d69
@@ -1265,7 +1412,7 @@ case $os in
429d69
 	-opened*)
429d69
 		os=-openedition
429d69
 		;;
429d69
-        -os400*)
429d69
+	-os400*)
429d69
 		os=-os400
429d69
 		;;
429d69
 	-wince*)
429d69
@@ -1314,7 +1461,7 @@ case $os in
429d69
 	-sinix*)
429d69
 		os=-sysv4
429d69
 		;;
429d69
-        -tpf*)
429d69
+	-tpf*)
429d69
 		os=-tpf
429d69
 		;;
429d69
 	-triton*)
429d69
@@ -1356,6 +1503,11 @@ case $os in
429d69
 	-zvmoe)
429d69
 		os=-zvmoe
429d69
 		;;
429d69
+	-dicos*)
429d69
+		os=-dicos
429d69
+		;;
429d69
+	-nacl*)
429d69
+		;;
429d69
 	-none)
429d69
 		;;
429d69
 	*)
429d69
@@ -1378,10 +1530,10 @@ else
429d69
 # system, and we'll never get to this point.
429d69
 
429d69
 case $basic_machine in
429d69
-        score-*)
429d69
+	score-*)
429d69
 		os=-elf
429d69
 		;;
429d69
-        spu-*)
429d69
+	spu-*)
429d69
 		os=-elf
429d69
 		;;
429d69
 	*-acorn)
429d69
@@ -1393,8 +1545,20 @@ case $basic_machine in
429d69
 	arm*-semi)
429d69
 		os=-aout
429d69
 		;;
429d69
-        c4x-* | tic4x-*)
429d69
-        	os=-coff
429d69
+	c4x-* | tic4x-*)
429d69
+		os=-coff
429d69
+		;;
429d69
+	hexagon-*)
429d69
+		os=-elf
429d69
+		;;
429d69
+	tic54x-*)
429d69
+		os=-coff
429d69
+		;;
429d69
+	tic55x-*)
429d69
+		os=-coff
429d69
+		;;
429d69
+	tic6x-*)
429d69
+		os=-coff
429d69
 		;;
429d69
 	# This must come before the *-dec entry.
429d69
 	pdp10-*)
429d69
@@ -1414,14 +1578,11 @@ case $basic_machine in
429d69
 		;;
429d69
 	m68000-sun)
429d69
 		os=-sunos3
429d69
-		# This also exists in the configure program, but was not the
429d69
-		# default.
429d69
-		# os=-sunos4
429d69
 		;;
429d69
 	m68*-cisco)
429d69
 		os=-aout
429d69
 		;;
429d69
-        mep-*)
429d69
+	mep-*)
429d69
 		os=-elf
429d69
 		;;
429d69
 	mips*-cisco)
429d69
@@ -1448,7 +1609,7 @@ case $basic_machine in
429d69
 	*-ibm)
429d69
 		os=-aix
429d69
 		;;
429d69
-    	*-knuth)
429d69
+	*-knuth)
429d69
 		os=-mmixware
429d69
 		;;
429d69
 	*-wec)
429d69
@@ -1553,7 +1714,7 @@ case $basic_machine in
429d69
 			-sunos*)
429d69
 				vendor=sun
429d69
 				;;
429d69
-			-aix*)
429d69
+			-cnk*|-aix*)
429d69
 				vendor=ibm
429d69
 				;;
429d69
 			-beos*)