e0e421
diff -urN zsh-5.0.2/config.guess zsh-5.0.2-aarch64/config.guess
e0e421
--- zsh-5.0.2/config.guess	2011-12-10 11:23:14.000000000 -0600
e0e421
+++ zsh-5.0.2-aarch64/config.guess	2013-03-03 09:34:03.438256458 -0600
e0e421
@@ -1,10 +1,10 @@
e0e421
 #! /bin/sh
e0e421
 # Attempt to guess a canonical system name.
e0e421
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
e0e421
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
e0e421
-#   Free Software Foundation, Inc.
e0e421
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
e0e421
+#   2011, 2012 Free Software Foundation, Inc.
e0e421
 
e0e421
-timestamp='2009-11-20'
e0e421
+timestamp='2012-09-25'
e0e421
 
e0e421
 # This file is free software; you can redistribute it and/or modify it
e0e421
 # under the terms of the GNU General Public License as published by
e0e421
@@ -17,9 +17,7 @@
e0e421
 # General Public License for more details.
e0e421
 #
e0e421
 # You should have received a copy of the GNU General Public License
e0e421
-# along with this program; if not, write to the Free Software
e0e421
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
e0e421
-# 02110-1301, USA.
e0e421
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
e0e421
 #
e0e421
 # As a special exception to the GNU General Public License, if you
e0e421
 # distribute this file as part of a program that contains a
e0e421
@@ -56,8 +54,9 @@
e0e421
 GNU config.guess ($timestamp)
e0e421
 
e0e421
 Originally written by Per Bothner.
e0e421
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
e0e421
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
e0e421
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
e0e421
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
e0e421
+Free Software Foundation, Inc.
e0e421
 
e0e421
 This is free software; see the source for copying conditions.  There is NO
e0e421
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
e0e421
@@ -144,7 +143,7 @@
e0e421
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
e0e421
     *:NetBSD:*:*)
e0e421
 	# NetBSD (nbsd) targets should (where applicable) match one or
e0e421
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
e0e421
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
e0e421
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
e0e421
 	# switched to ELF, *-*-netbsd* would select the old
e0e421
 	# object file format.  This provides both forward
e0e421
@@ -180,7 +179,7 @@
e0e421
 		fi
e0e421
 		;;
e0e421
 	    *)
e0e421
-	        os=netbsd
e0e421
+		os=netbsd
e0e421
 		;;
e0e421
 	esac
e0e421
 	# The OS release
e0e421
@@ -201,6 +200,10 @@
e0e421
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
e0e421
 	echo "${machine}-${os}${release}"
e0e421
 	exit ;;
e0e421
+    *:Bitrig:*:*)
e0e421
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
e0e421
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
e0e421
+	exit ;;
e0e421
     *:OpenBSD:*:*)
e0e421
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
e0e421
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
e0e421
@@ -223,7 +226,7 @@
e0e421
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
e0e421
 		;;
e0e421
 	*5.*)
e0e421
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
e0e421
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
e0e421
 		;;
e0e421
 	esac
e0e421
 	# According to Compaq, /usr/sbin/psrinfo has been available on
e0e421
@@ -269,7 +272,10 @@
e0e421
 	# A Xn.n version is an unreleased experimental baselevel.
e0e421
 	# 1.2 uses "1.2" for uname -r.
e0e421
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
e0e421
-	exit ;;
e0e421
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
e0e421
+	exitcode=$?
e0e421
+	trap '' 0
e0e421
+	exit $exitcode ;;
e0e421
     Alpha\ *:Windows_NT*:*)
e0e421
 	# How do we know it's Interix rather than the generic POSIX subsystem?
e0e421
 	# Should we change UNAME_MACHINE based on the output of uname instead
e0e421
@@ -295,12 +301,12 @@
e0e421
 	echo s390-ibm-zvmoe
e0e421
 	exit ;;
e0e421
     *:OS400:*:*)
e0e421
-        echo powerpc-ibm-os400
e0e421
+	echo powerpc-ibm-os400
e0e421
 	exit ;;
e0e421
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
e0e421
 	echo arm-acorn-riscix${UNAME_RELEASE}
e0e421
 	exit ;;
e0e421
-    arm:riscos:*:*|arm:RISCOS:*:*)
e0e421
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
e0e421
 	echo arm-unknown-riscos
e0e421
 	exit ;;
e0e421
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
e0e421
@@ -394,23 +400,23 @@
e0e421
     # MiNT.  But MiNT is downward compatible to TOS, so this should
e0e421
     # be no problem.
e0e421
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
e0e421
-        echo m68k-atari-mint${UNAME_RELEASE}
e0e421
+	echo m68k-atari-mint${UNAME_RELEASE}
e0e421
 	exit ;;
e0e421
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
e0e421
 	echo m68k-atari-mint${UNAME_RELEASE}
e0e421
-        exit ;;
e0e421
+	exit ;;
e0e421
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
e0e421
-        echo m68k-atari-mint${UNAME_RELEASE}
e0e421
+	echo m68k-atari-mint${UNAME_RELEASE}
e0e421
 	exit ;;
e0e421
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
e0e421
-        echo m68k-milan-mint${UNAME_RELEASE}
e0e421
-        exit ;;
e0e421
+	echo m68k-milan-mint${UNAME_RELEASE}
e0e421
+	exit ;;
e0e421
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
e0e421
-        echo m68k-hades-mint${UNAME_RELEASE}
e0e421
-        exit ;;
e0e421
+	echo m68k-hades-mint${UNAME_RELEASE}
e0e421
+	exit ;;
e0e421
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
e0e421
-        echo m68k-unknown-mint${UNAME_RELEASE}
e0e421
-        exit ;;
e0e421
+	echo m68k-unknown-mint${UNAME_RELEASE}
e0e421
+	exit ;;
e0e421
     m68k:machten:*:*)
e0e421
 	echo m68k-apple-machten${UNAME_RELEASE}
e0e421
 	exit ;;
e0e421
@@ -480,8 +486,8 @@
e0e421
 	echo m88k-motorola-sysv3
e0e421
 	exit ;;
e0e421
     AViiON:dgux:*:*)
e0e421
-        # DG/UX returns AViiON for all architectures
e0e421
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
e0e421
+	# DG/UX returns AViiON for all architectures
e0e421
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
e0e421
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
e0e421
 	then
e0e421
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
e0e421
@@ -494,7 +500,7 @@
e0e421
 	else
e0e421
 	    echo i586-dg-dgux${UNAME_RELEASE}
e0e421
 	fi
e0e421
- 	exit ;;
e0e421
+	exit ;;
e0e421
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
e0e421
 	echo m88k-dolphin-sysv3
e0e421
 	exit ;;
e0e421
@@ -551,7 +557,7 @@
e0e421
 		echo rs6000-ibm-aix3.2
e0e421
 	fi
e0e421
 	exit ;;
e0e421
-    *:AIX:*:[456])
e0e421
+    *:AIX:*:[4567])
e0e421
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
e0e421
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
e0e421
 		IBM_ARCH=rs6000
e0e421
@@ -594,52 +600,52 @@
e0e421
 	    9000/[678][0-9][0-9])
e0e421
 		if [ -x /usr/bin/getconf ]; then
e0e421
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
e0e421
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
e0e421
-                    case "${sc_cpu_version}" in
e0e421
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
e0e421
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
e0e421
-                      532)                      # CPU_PA_RISC2_0
e0e421
-                        case "${sc_kernel_bits}" in
e0e421
-                          32) HP_ARCH="hppa2.0n" ;;
e0e421
-                          64) HP_ARCH="hppa2.0w" ;;
e0e421
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
e0e421
+		    case "${sc_cpu_version}" in
e0e421
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
e0e421
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
e0e421
+		      532)                      # CPU_PA_RISC2_0
e0e421
+			case "${sc_kernel_bits}" in
e0e421
+			  32) HP_ARCH="hppa2.0n" ;;
e0e421
+			  64) HP_ARCH="hppa2.0w" ;;
e0e421
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
e0e421
-                        esac ;;
e0e421
-                    esac
e0e421
+			esac ;;
e0e421
+		    esac
e0e421
 		fi
e0e421
 		if [ "${HP_ARCH}" = "" ]; then
e0e421
 		    eval $set_cc_for_build
e0e421
-		    sed 's/^              //' << EOF >$dummy.c
e0e421
+		    sed 's/^		//' << EOF >$dummy.c
e0e421
+
e0e421
+		#define _HPUX_SOURCE
e0e421
+		#include <stdlib.h>
e0e421
+		#include <unistd.h>
e0e421
 
e0e421
-              #define _HPUX_SOURCE
e0e421
-              #include <stdlib.h>
e0e421
-              #include <unistd.h>
e0e421
-
e0e421
-              int main ()
e0e421
-              {
e0e421
-              #if defined(_SC_KERNEL_BITS)
e0e421
-                  long bits = sysconf(_SC_KERNEL_BITS);
e0e421
-              #endif
e0e421
-                  long cpu  = sysconf (_SC_CPU_VERSION);
e0e421
-
e0e421
-                  switch (cpu)
e0e421
-              	{
e0e421
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
e0e421
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
e0e421
-              	case CPU_PA_RISC2_0:
e0e421
-              #if defined(_SC_KERNEL_BITS)
e0e421
-              	    switch (bits)
e0e421
-              		{
e0e421
-              		case 64: puts ("hppa2.0w"); break;
e0e421
-              		case 32: puts ("hppa2.0n"); break;
e0e421
-              		default: puts ("hppa2.0"); break;
e0e421
-              		} break;
e0e421
-              #else  /* !defined(_SC_KERNEL_BITS) */
e0e421
-              	    puts ("hppa2.0"); break;
e0e421
-              #endif
e0e421
-              	default: puts ("hppa1.0"); break;
e0e421
-              	}
e0e421
-                  exit (0);
e0e421
-              }
e0e421
+		int main ()
e0e421
+		{
e0e421
+		#if defined(_SC_KERNEL_BITS)
e0e421
+		    long bits = sysconf(_SC_KERNEL_BITS);
e0e421
+		#endif
e0e421
+		    long cpu  = sysconf (_SC_CPU_VERSION);
e0e421
+
e0e421
+		    switch (cpu)
e0e421
+			{
e0e421
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
e0e421
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
e0e421
+			case CPU_PA_RISC2_0:
e0e421
+		#if defined(_SC_KERNEL_BITS)
e0e421
+			    switch (bits)
e0e421
+				{
e0e421
+				case 64: puts ("hppa2.0w"); break;
e0e421
+				case 32: puts ("hppa2.0n"); break;
e0e421
+				default: puts ("hppa2.0"); break;
e0e421
+				} break;
e0e421
+		#else  /* !defined(_SC_KERNEL_BITS) */
e0e421
+			    puts ("hppa2.0"); break;
e0e421
+		#endif
e0e421
+			default: puts ("hppa1.0"); break;
e0e421
+			}
e0e421
+		    exit (0);
e0e421
+		}
e0e421
 EOF
e0e421
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
e0e421
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
e0e421
@@ -730,22 +736,22 @@
e0e421
 	exit ;;
e0e421
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
e0e421
 	echo c1-convex-bsd
e0e421
-        exit ;;
e0e421
+	exit ;;
e0e421
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
e0e421
 	if getsysinfo -f scalar_acc
e0e421
 	then echo c32-convex-bsd
e0e421
 	else echo c2-convex-bsd
e0e421
 	fi
e0e421
-        exit ;;
e0e421
+	exit ;;
e0e421
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
e0e421
 	echo c34-convex-bsd
e0e421
-        exit ;;
e0e421
+	exit ;;
e0e421
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
e0e421
 	echo c38-convex-bsd
e0e421
-        exit ;;
e0e421
+	exit ;;
e0e421
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
e0e421
 	echo c4-convex-bsd
e0e421
-        exit ;;
e0e421
+	exit ;;
e0e421
     CRAY*Y-MP:*:*:*)
e0e421
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
e0e421
 	exit ;;
e0e421
@@ -769,14 +775,14 @@
e0e421
 	exit ;;
e0e421
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
e0e421
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
e0e421
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
e0e421
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
e0e421
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
e0e421
-        exit ;;
e0e421
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
e0e421
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
e0e421
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
e0e421
+	exit ;;
e0e421
     5000:UNIX_System_V:4.*:*)
e0e421
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
e0e421
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
e0e421
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
e0e421
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
e0e421
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
e0e421
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
e0e421
 	exit ;;
e0e421
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
e0e421
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
e0e421
@@ -788,30 +794,35 @@
e0e421
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
e0e421
 	exit ;;
e0e421
     *:FreeBSD:*:*)
e0e421
-	case ${UNAME_MACHINE} in
e0e421
-	    pc98)
e0e421
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
e0e421
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
e0e421
+	case ${UNAME_PROCESSOR} in
e0e421
 	    amd64)
e0e421
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
e0e421
 	    *)
e0e421
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
e0e421
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
e0e421
 	esac
e0e421
 	exit ;;
e0e421
     i*:CYGWIN*:*)
e0e421
 	echo ${UNAME_MACHINE}-pc-cygwin
e0e421
 	exit ;;
e0e421
+    *:MINGW64*:*)
e0e421
+	echo ${UNAME_MACHINE}-pc-mingw64
e0e421
+	exit ;;
e0e421
     *:MINGW*:*)
e0e421
 	echo ${UNAME_MACHINE}-pc-mingw32
e0e421
 	exit ;;
e0e421
+    i*:MSYS*:*)
e0e421
+	echo ${UNAME_MACHINE}-pc-msys
e0e421
+	exit ;;
e0e421
     i*:windows32*:*)
e0e421
-    	# uname -m includes "-pc" on this system.
e0e421
-    	echo ${UNAME_MACHINE}-mingw32
e0e421
+	# uname -m includes "-pc" on this system.
e0e421
+	echo ${UNAME_MACHINE}-mingw32
e0e421
 	exit ;;
e0e421
     i*:PW*:*)
e0e421
 	echo ${UNAME_MACHINE}-pc-pw32
e0e421
 	exit ;;
e0e421
     *:Interix*:*)
e0e421
-    	case ${UNAME_MACHINE} in
e0e421
+	case ${UNAME_MACHINE} in
e0e421
 	    x86)
e0e421
 		echo i586-pc-interix${UNAME_RELEASE}
e0e421
 		exit ;;
e0e421
@@ -857,6 +868,13 @@
e0e421
     i*86:Minix:*:*)
e0e421
 	echo ${UNAME_MACHINE}-pc-minix
e0e421
 	exit ;;
e0e421
+    aarch64:Linux:*:*)
e0e421
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
+	exit ;;
e0e421
+    aarch64_be:Linux:*:*)
e0e421
+	UNAME_MACHINE=aarch64_be
e0e421
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
+	exit ;;
e0e421
     alpha:Linux:*:*)
e0e421
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
e0e421
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
e0e421
@@ -866,7 +884,7 @@
e0e421
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
e0e421
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
e0e421
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
e0e421
-        esac
e0e421
+	esac
e0e421
 	objdump --private-headers /bin/sh | grep -q ld.so.1
e0e421
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
e0e421
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
e0e421
@@ -878,20 +896,29 @@
e0e421
 	then
e0e421
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
 	else
e0e421
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
e0e421
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
e0e421
+		| grep -q __ARM_PCS_VFP
e0e421
+	    then
e0e421
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
e0e421
+	    else
e0e421
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
e0e421
+	    fi
e0e421
 	fi
e0e421
 	exit ;;
e0e421
     avr32*:Linux:*:*)
e0e421
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
 	exit ;;
e0e421
     cris:Linux:*:*)
e0e421
-	echo cris-axis-linux-gnu
e0e421
+	echo ${UNAME_MACHINE}-axis-linux-gnu
e0e421
 	exit ;;
e0e421
     crisv32:Linux:*:*)
e0e421
-	echo crisv32-axis-linux-gnu
e0e421
+	echo ${UNAME_MACHINE}-axis-linux-gnu
e0e421
 	exit ;;
e0e421
     frv:Linux:*:*)
e0e421
-    	echo frv-unknown-linux-gnu
e0e421
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
+	exit ;;
e0e421
+    hexagon:Linux:*:*)
e0e421
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
 	exit ;;
e0e421
     i*86:Linux:*:*)
e0e421
 	LIBC=gnu
e0e421
@@ -933,7 +960,7 @@
e0e421
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
e0e421
 	;;
e0e421
     or32:Linux:*:*)
e0e421
-	echo or32-unknown-linux-gnu
e0e421
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
 	exit ;;
e0e421
     padre:Linux:*:*)
e0e421
 	echo sparc-unknown-linux-gnu
e0e421
@@ -959,7 +986,7 @@
e0e421
 	echo ${UNAME_MACHINE}-ibm-linux
e0e421
 	exit ;;
e0e421
     sh64*:Linux:*:*)
e0e421
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
 	exit ;;
e0e421
     sh*:Linux:*:*)
e0e421
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
@@ -967,14 +994,17 @@
e0e421
     sparc:Linux:*:* | sparc64:Linux:*:*)
e0e421
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
 	exit ;;
e0e421
+    tile*:Linux:*:*)
e0e421
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
+	exit ;;
e0e421
     vax:Linux:*:*)
e0e421
 	echo ${UNAME_MACHINE}-dec-linux-gnu
e0e421
 	exit ;;
e0e421
     x86_64:Linux:*:*)
e0e421
-	echo x86_64-unknown-linux-gnu
e0e421
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
 	exit ;;
e0e421
     xtensa*:Linux:*:*)
e0e421
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
e0e421
 	exit ;;
e0e421
     i*86:DYNIX/ptx:4*:*)
e0e421
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
e0e421
@@ -983,11 +1013,11 @@
e0e421
 	echo i386-sequent-sysv4
e0e421
 	exit ;;
e0e421
     i*86:UNIX_SV:4.2MP:2.*)
e0e421
-        # Unixware is an offshoot of SVR4, but it has its own version
e0e421
-        # number series starting with 2...
e0e421
-        # I am not positive that other SVR4 systems won't match this,
e0e421
+	# Unixware is an offshoot of SVR4, but it has its own version
e0e421
+	# number series starting with 2...
e0e421
+	# I am not positive that other SVR4 systems won't match this,
e0e421
 	# I just have to hope.  -- rms.
e0e421
-        # Use sysv4.2uw... so that sysv4* matches it.
e0e421
+	# Use sysv4.2uw... so that sysv4* matches it.
e0e421
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
e0e421
 	exit ;;
e0e421
     i*86:OS/2:*:*)
e0e421
@@ -1019,7 +1049,7 @@
e0e421
 	fi
e0e421
 	exit ;;
e0e421
     i*86:*:5:[678]*)
e0e421
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
e0e421
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
e0e421
 	case `/bin/uname -X | grep "^Machine"` in
e0e421
 	    *486*)	     UNAME_MACHINE=i486 ;;
e0e421
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
e0e421
@@ -1047,13 +1077,13 @@
e0e421
 	exit ;;
e0e421
     pc:*:*:*)
e0e421
 	# Left here for compatibility:
e0e421
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
e0e421
-        # the processor, so we play safe by assuming i586.
e0e421
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
e0e421
+	# the processor, so we play safe by assuming i586.
e0e421
 	# Note: whatever this is, it MUST be the same as what config.sub
e0e421
 	# prints for the "djgpp" host, or else GDB configury will decide that
e0e421
 	# this is a cross-build.
e0e421
 	echo i586-pc-msdosdjgpp
e0e421
-        exit ;;
e0e421
+	exit ;;
e0e421
     Intel:Mach:3*:*)
e0e421
 	echo i386-pc-mach3
e0e421
 	exit ;;
e0e421
@@ -1088,8 +1118,8 @@
e0e421
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
e0e421
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
e0e421
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
e0e421
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
e0e421
-          && { echo i486-ncr-sysv4; exit; } ;;
e0e421
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
e0e421
+	  && { echo i486-ncr-sysv4; exit; } ;;
e0e421
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
e0e421
 	OS_REL='.3'
e0e421
 	test -r /etc/.relid \
e0e421
@@ -1132,10 +1162,10 @@
e0e421
 		echo ns32k-sni-sysv
e0e421
 	fi
e0e421
 	exit ;;
e0e421
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
e0e421
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
e0e421
-        echo i586-unisys-sysv4
e0e421
-        exit ;;
e0e421
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
e0e421
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
e0e421
+	echo i586-unisys-sysv4
e0e421
+	exit ;;
e0e421
     *:UNIX_System_V:4*:FTX*)
e0e421
 	# From Gerald Hewes <hewes@openmarket.com>.
e0e421
 	# How about differentiating between stratus architectures? -djm
e0e421
@@ -1161,11 +1191,11 @@
e0e421
 	exit ;;
e0e421
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
e0e421
 	if [ -d /usr/nec ]; then
e0e421
-	        echo mips-nec-sysv${UNAME_RELEASE}
e0e421
+		echo mips-nec-sysv${UNAME_RELEASE}
e0e421
 	else
e0e421
-	        echo mips-unknown-sysv${UNAME_RELEASE}
e0e421
+		echo mips-unknown-sysv${UNAME_RELEASE}
e0e421
 	fi
e0e421
-        exit ;;
e0e421
+	exit ;;
e0e421
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
e0e421
 	echo powerpc-be-beos
e0e421
 	exit ;;
e0e421
@@ -1178,6 +1208,9 @@
e0e421
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
e0e421
 	echo i586-pc-haiku
e0e421
 	exit ;;
e0e421
+    x86_64:Haiku:*:*)
e0e421
+	echo x86_64-unknown-haiku
e0e421
+	exit ;;
e0e421
     SX-4:SUPER-UX:*:*)
e0e421
 	echo sx4-nec-superux${UNAME_RELEASE}
e0e421
 	exit ;;
e0e421
@@ -1230,7 +1263,10 @@
e0e421
     *:QNX:*:4*)
e0e421
 	echo i386-pc-qnx
e0e421
 	exit ;;
e0e421
-    NSE-?:NONSTOP_KERNEL:*:*)
e0e421
+    NEO-?:NONSTOP_KERNEL:*:*)
e0e421
+	echo neo-tandem-nsk${UNAME_RELEASE}
e0e421
+	exit ;;
e0e421
+    NSE-*:NONSTOP_KERNEL:*:*)
e0e421
 	echo nse-tandem-nsk${UNAME_RELEASE}
e0e421
 	exit ;;
e0e421
     NSR-?:NONSTOP_KERNEL:*:*)
e0e421
@@ -1275,13 +1311,13 @@
e0e421
 	echo pdp10-unknown-its
e0e421
 	exit ;;
e0e421
     SEI:*:*:SEIUX)
e0e421
-        echo mips-sei-seiux${UNAME_RELEASE}
e0e421
+	echo mips-sei-seiux${UNAME_RELEASE}
e0e421
 	exit ;;
e0e421
     *:DragonFly:*:*)
e0e421
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
e0e421
 	exit ;;
e0e421
     *:*VMS:*:*)
e0e421
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
e0e421
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
e0e421
 	case "${UNAME_MACHINE}" in
e0e421
 	    A*) echo alpha-dec-vms ; exit ;;
e0e421
 	    I*) echo ia64-dec-vms ; exit ;;
e0e421
@@ -1299,11 +1335,11 @@
e0e421
     i*86:AROS:*:*)
e0e421
 	echo ${UNAME_MACHINE}-pc-aros
e0e421
 	exit ;;
e0e421
+    x86_64:VMkernel:*:*)
e0e421
+	echo ${UNAME_MACHINE}-unknown-esx
e0e421
+	exit ;;
e0e421
 esac
e0e421
 
e0e421
-#echo '(No uname command or uname output not recognized.)' 1>&2
e0e421
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
e0e421
-
e0e421
 eval $set_cc_for_build
e0e421
 cat >$dummy.c <
e0e421
 #ifdef _SEQUENT_
e0e421
@@ -1321,11 +1357,11 @@
e0e421
 #include <sys/param.h>
e0e421
   printf ("m68k-sony-newsos%s\n",
e0e421
 #ifdef NEWSOS4
e0e421
-          "4"
e0e421
+	"4"
e0e421
 #else
e0e421
-	  ""
e0e421
+	""
e0e421
 #endif
e0e421
-         ); exit (0);
e0e421
+	); exit (0);
e0e421
 #endif
e0e421
 #endif
e0e421
 
e0e421
diff -urN zsh-5.0.2/config.sub zsh-5.0.2-aarch64/config.sub
e0e421
--- zsh-5.0.2/config.sub	2011-12-10 11:23:14.000000000 -0600
e0e421
+++ zsh-5.0.2-aarch64/config.sub	2013-03-03 09:34:03.465253348 -0600
e0e421
@@ -1,10 +1,10 @@
e0e421
 #! /bin/sh
e0e421
 # Configuration validation subroutine script.
e0e421
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
e0e421
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
e0e421
-#   Free Software Foundation, Inc.
e0e421
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
e0e421
+#   2011, 2012 Free Software Foundation, Inc.
e0e421
 
e0e421
-timestamp='2009-11-20'
e0e421
+timestamp='2012-10-10'
e0e421
 
e0e421
 # This file is (in principle) common to ALL GNU software.
e0e421
 # The presence of a machine in this file suggests that SOME GNU software
e0e421
@@ -21,9 +21,7 @@
e0e421
 # GNU General Public License for more details.
e0e421
 #
e0e421
 # You should have received a copy of the GNU General Public License
e0e421
-# along with this program; if not, write to the Free Software
e0e421
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
e0e421
-# 02110-1301, USA.
e0e421
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
e0e421
 #
e0e421
 # As a special exception to the GNU General Public License, if you
e0e421
 # distribute this file as part of a program that contains a
e0e421
@@ -75,8 +73,9 @@
e0e421
 version="\
e0e421
 GNU config.sub ($timestamp)
e0e421
 
e0e421
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
e0e421
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
e0e421
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
e0e421
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
e0e421
+Free Software Foundation, Inc.
e0e421
 
e0e421
 This is free software; see the source for copying conditions.  There is NO
e0e421
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
e0e421
@@ -123,13 +122,18 @@
e0e421
 # Here we must recognize all the valid KERNEL-OS combinations.
e0e421
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
e0e421
 case $maybe_os in
e0e421
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
e0e421
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
e0e421
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
e0e421
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
e0e421
+  knetbsd*-gnu* | netbsd*-gnu* | \
e0e421
   kopensolaris*-gnu* | \
e0e421
   storm-chaos* | os2-emx* | rtmk-nova*)
e0e421
     os=-$maybe_os
e0e421
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
e0e421
     ;;
e0e421
+  android-linux)
e0e421
+    os=-linux-android
e0e421
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
e0e421
+    ;;
e0e421
   *)
e0e421
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
e0e421
     if [ $basic_machine != $1 ]
e0e421
@@ -152,12 +156,12 @@
e0e421
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
e0e421
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
e0e421
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
e0e421
-	-apple | -axis | -knuth | -cray | -microblaze)
e0e421
+	-apple | -axis | -knuth | -cray | -microblaze*)
e0e421
 		os=
e0e421
 		basic_machine=$1
e0e421
 		;;
e0e421
-        -bluegene*)
e0e421
-	        os=-cnk
e0e421
+	-bluegene*)
e0e421
+		os=-cnk
e0e421
 		;;
e0e421
 	-sim | -cisco | -oki | -wec | -winbond)
e0e421
 		os=
e0e421
@@ -173,10 +177,10 @@
e0e421
 		os=-chorusos
e0e421
 		basic_machine=$1
e0e421
 		;;
e0e421
- 	-chorusrdb)
e0e421
- 		os=-chorusrdb
e0e421
+	-chorusrdb)
e0e421
+		os=-chorusrdb
e0e421
 		basic_machine=$1
e0e421
- 		;;
e0e421
+		;;
e0e421
 	-hiux*)
e0e421
 		os=-hiuxwe2
e0e421
 		;;
e0e421
@@ -221,6 +225,12 @@
e0e421
 	-isc*)
e0e421
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
e0e421
 		;;
e0e421
+	-lynx*178)
e0e421
+		os=-lynxos178
e0e421
+		;;
e0e421
+	-lynx*5)
e0e421
+		os=-lynxos5
e0e421
+		;;
e0e421
 	-lynx*)
e0e421
 		os=-lynxos
e0e421
 		;;
e0e421
@@ -245,20 +255,25 @@
e0e421
 	# Some are omitted here because they have special meanings below.
e0e421
 	1750a | 580 \
e0e421
 	| a29k \
e0e421
+	| aarch64 | aarch64_be \
e0e421
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
e0e421
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
e0e421
 	| am33_2.0 \
e0e421
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
e0e421
+        | be32 | be64 \
e0e421
 	| bfin \
e0e421
 	| c4x | clipper \
e0e421
 	| d10v | d30v | dlx | dsp16xx \
e0e421
+	| epiphany \
e0e421
 	| fido | fr30 | frv \
e0e421
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
e0e421
+	| hexagon \
e0e421
 	| i370 | i860 | i960 | ia64 \
e0e421
 	| ip2k | iq2000 \
e0e421
+	| le32 | le64 \
e0e421
 	| lm32 \
e0e421
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
e0e421
-	| maxq | mb | microblaze | mcore | mep | metag \
e0e421
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
e0e421
 	| mips | mipsbe | mipseb | mipsel | mipsle \
e0e421
 	| mips16 \
e0e421
 	| mips64 | mips64el \
e0e421
@@ -281,29 +296,39 @@
e0e421
 	| moxie \
e0e421
 	| mt \
e0e421
 	| msp430 \
e0e421
+	| nds32 | nds32le | nds32be \
e0e421
 	| nios | nios2 \
e0e421
 	| ns16k | ns32k \
e0e421
+	| open8 \
e0e421
 	| or32 \
e0e421
 	| pdp10 | pdp11 | pj | pjl \
e0e421
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
e0e421
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
e0e421
 	| pyramid \
e0e421
-	| rx \
e0e421
+	| rl78 | rx \
e0e421
 	| score \
e0e421
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
e0e421
 	| sh64 | sh64le \
e0e421
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
e0e421
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
e0e421
-	| spu | strongarm \
e0e421
-	| tahoe | thumb | tic4x | tic80 | tron \
e0e421
+	| spu \
e0e421
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
e0e421
 	| ubicom32 \
e0e421
-	| v850 | v850e \
e0e421
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
e0e421
 	| we32k \
e0e421
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
e0e421
+	| x86 | xc16x | xstormy16 | xtensa \
e0e421
 	| z8k | z80)
e0e421
 		basic_machine=$basic_machine-unknown
e0e421
 		;;
e0e421
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
e0e421
-		# Motorola 68HC11/12.
e0e421
+	c54x)
e0e421
+		basic_machine=tic54x-unknown
e0e421
+		;;
e0e421
+	c55x)
e0e421
+		basic_machine=tic55x-unknown
e0e421
+		;;
e0e421
+	c6x)
e0e421
+		basic_machine=tic6x-unknown
e0e421
+		;;
e0e421
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
e0e421
 		basic_machine=$basic_machine-unknown
e0e421
 		os=-none
e0e421
 		;;
e0e421
@@ -313,6 +338,21 @@
e0e421
 		basic_machine=mt-unknown
e0e421
 		;;
e0e421
 
e0e421
+	strongarm | thumb | xscale)
e0e421
+		basic_machine=arm-unknown
e0e421
+		;;
e0e421
+	xgate)
e0e421
+		basic_machine=$basic_machine-unknown
e0e421
+		os=-none
e0e421
+		;;
e0e421
+	xscaleeb)
e0e421
+		basic_machine=armeb-unknown
e0e421
+		;;
e0e421
+
e0e421
+	xscaleel)
e0e421
+		basic_machine=armel-unknown
e0e421
+		;;
e0e421
+
e0e421
 	# We use `pc' rather than `unknown'
e0e421
 	# because (1) that's what they normally are, and
e0e421
 	# (2) the word "unknown" tends to confuse beginning users.
e0e421
@@ -327,25 +367,30 @@
e0e421
 	# Recognize the basic CPU types with company name.
e0e421
 	580-* \
e0e421
 	| a29k-* \
e0e421
+	| aarch64-* | aarch64_be-* \
e0e421
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
e0e421
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
e0e421
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
e0e421
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
e0e421
 	| avr-* | avr32-* \
e0e421
+	| be32-* | be64-* \
e0e421
 	| bfin-* | bs2000-* \
e0e421
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
e0e421
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
e0e421
 	| clipper-* | craynv-* | cydra-* \
e0e421
 	| d10v-* | d30v-* | dlx-* \
e0e421
 	| elxsi-* \
e0e421
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
e0e421
 	| h8300-* | h8500-* \
e0e421
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
e0e421
+	| hexagon-* \
e0e421
 	| i*86-* | i860-* | i960-* | ia64-* \
e0e421
 	| ip2k-* | iq2000-* \
e0e421
+	| le32-* | le64-* \
e0e421
 	| lm32-* \
e0e421
 	| m32c-* | m32r-* | m32rle-* \
e0e421
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
e0e421
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
e0e421
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
e0e421
+	| microblaze-* | microblazeel-* \
e0e421
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
e0e421
 	| mips16-* \
e0e421
 	| mips64-* | mips64el-* \
e0e421
@@ -367,25 +412,29 @@
e0e421
 	| mmix-* \
e0e421
 	| mt-* \
e0e421
 	| msp430-* \
e0e421
+	| nds32-* | nds32le-* | nds32be-* \
e0e421
 	| nios-* | nios2-* \
e0e421
 	| none-* | np1-* | ns16k-* | ns32k-* \
e0e421
+	| open8-* \
e0e421
 	| orion-* \
e0e421
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
e0e421
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
e0e421
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
e0e421
 	| pyramid-* \
e0e421
-	| romp-* | rs6000-* | rx-* \
e0e421
+	| rl78-* | romp-* | rs6000-* | rx-* \
e0e421
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
e0e421
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
e0e421
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
e0e421
 	| sparclite-* \
e0e421
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
e0e421
-	| tahoe-* | thumb-* \
e0e421
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
e0e421
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
e0e421
+	| tahoe-* \
e0e421
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
e0e421
+	| tile*-* \
e0e421
 	| tron-* \
e0e421
 	| ubicom32-* \
e0e421
-	| v850-* | v850e-* | vax-* \
e0e421
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
e0e421
+	| vax-* \
e0e421
 	| we32k-* \
e0e421
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
e0e421
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
e0e421
 	| xstormy16-* | xtensa*-* \
e0e421
 	| ymp-* \
e0e421
 	| z8k-* | z80-*)
e0e421
@@ -410,7 +459,7 @@
e0e421
 		basic_machine=a29k-amd
e0e421
 		os=-udi
e0e421
 		;;
e0e421
-    	abacus)
e0e421
+	abacus)
e0e421
 		basic_machine=abacus-unknown
e0e421
 		;;
e0e421
 	adobe68k)
e0e421
@@ -480,11 +529,20 @@
e0e421
 		basic_machine=powerpc-ibm
e0e421
 		os=-cnk
e0e421
 		;;
e0e421
+	c54x-*)
e0e421
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
e0e421
+		;;
e0e421
+	c55x-*)
e0e421
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
e0e421
+		;;
e0e421
+	c6x-*)
e0e421
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
e0e421
+		;;
e0e421
 	c90)
e0e421
 		basic_machine=c90-cray
e0e421
 		os=-unicos
e0e421
 		;;
e0e421
-        cegcc)
e0e421
+	cegcc)
e0e421
 		basic_machine=arm-unknown
e0e421
 		os=-cegcc
e0e421
 		;;
e0e421
@@ -516,7 +574,7 @@
e0e421
 		basic_machine=craynv-cray
e0e421
 		os=-unicosmp
e0e421
 		;;
e0e421
-	cr16)
e0e421
+	cr16 | cr16-*)
e0e421
 		basic_machine=cr16-unknown
e0e421
 		os=-elf
e0e421
 		;;
e0e421
@@ -674,7 +732,6 @@
e0e421
 	i370-ibm* | ibm*)
e0e421
 		basic_machine=i370-ibm
e0e421
 		;;
e0e421
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
e0e421
 	i*86v32)
e0e421
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
e0e421
 		os=-sysv32
e0e421
@@ -732,9 +789,13 @@
e0e421
 		basic_machine=ns32k-utek
e0e421
 		os=-sysv
e0e421
 		;;
e0e421
-        microblaze)
e0e421
+	microblaze*)
e0e421
 		basic_machine=microblaze-xilinx
e0e421
 		;;
e0e421
+	mingw64)
e0e421
+		basic_machine=x86_64-pc
e0e421
+		os=-mingw64
e0e421
+		;;
e0e421
 	mingw32)
e0e421
 		basic_machine=i386-pc
e0e421
 		os=-mingw32
e0e421
@@ -771,10 +832,18 @@
e0e421
 	ms1-*)
e0e421
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
e0e421
 		;;
e0e421
+	msys)
e0e421
+		basic_machine=i386-pc
e0e421
+		os=-msys
e0e421
+		;;
e0e421
 	mvs)
e0e421
 		basic_machine=i370-ibm
e0e421
 		os=-mvs
e0e421
 		;;
e0e421
+	nacl)
e0e421
+		basic_machine=le32-unknown
e0e421
+		os=-nacl
e0e421
+		;;
e0e421
 	ncr3000)
e0e421
 		basic_machine=i486-ncr
e0e421
 		os=-sysv4
e0e421
@@ -839,6 +908,12 @@
e0e421
 	np1)
e0e421
 		basic_machine=np1-gould
e0e421
 		;;
e0e421
+	neo-tandem)
e0e421
+		basic_machine=neo-tandem
e0e421
+		;;
e0e421
+	nse-tandem)
e0e421
+		basic_machine=nse-tandem
e0e421
+		;;
e0e421
 	nsr-tandem)
e0e421
 		basic_machine=nsr-tandem
e0e421
 		;;
e0e421
@@ -921,9 +996,10 @@
e0e421
 		;;
e0e421
 	power)	basic_machine=power-ibm
e0e421
 		;;
e0e421
-	ppc)	basic_machine=powerpc-unknown
e0e421
+	ppc | ppcbe)	basic_machine=powerpc-unknown
e0e421
 		;;
e0e421
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
e0e421
+	ppc-* | ppcbe-*)
e0e421
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
e0e421
 		;;
e0e421
 	ppcle | powerpclittle | ppc-le | powerpc-little)
e0e421
 		basic_machine=powerpcle-unknown
e0e421
@@ -1017,6 +1093,9 @@
e0e421
 		basic_machine=i860-stratus
e0e421
 		os=-sysv4
e0e421
 		;;
e0e421
+	strongarm-* | thumb-*)
e0e421
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
e0e421
+		;;
e0e421
 	sun2)
e0e421
 		basic_machine=m68000-sun
e0e421
 		;;
e0e421
@@ -1073,20 +1152,8 @@
e0e421
 		basic_machine=t90-cray
e0e421
 		os=-unicos
e0e421
 		;;
e0e421
-	tic54x | c54x*)
e0e421
-		basic_machine=tic54x-unknown
e0e421
-		os=-coff
e0e421
-		;;
e0e421
-	tic55x | c55x*)
e0e421
-		basic_machine=tic55x-unknown
e0e421
-		os=-coff
e0e421
-		;;
e0e421
-	tic6x | c6x*)
e0e421
-		basic_machine=tic6x-unknown
e0e421
-		os=-coff
e0e421
-		;;
e0e421
 	tile*)
e0e421
-		basic_machine=tile-unknown
e0e421
+		basic_machine=$basic_machine-unknown
e0e421
 		os=-linux-gnu
e0e421
 		;;
e0e421
 	tx39)
e0e421
@@ -1156,6 +1223,9 @@
e0e421
 	xps | xps100)
e0e421
 		basic_machine=xps100-honeywell
e0e421
 		;;
e0e421
+	xscale-* | xscalee[bl]-*)
e0e421
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
e0e421
+		;;
e0e421
 	ymp)
e0e421
 		basic_machine=ymp-cray
e0e421
 		os=-unicos
e0e421
@@ -1253,11 +1323,11 @@
e0e421
 if [ x"$os" != x"" ]
e0e421
 then
e0e421
 case $os in
e0e421
-        # First match some system type aliases
e0e421
-        # that might get confused with valid system types.
e0e421
+	# First match some system type aliases
e0e421
+	# that might get confused with valid system types.
e0e421
 	# -solaris* is a basic system type, with this one exception.
e0e421
-        -auroraux)
e0e421
-	        os=-auroraux
e0e421
+	-auroraux)
e0e421
+		os=-auroraux
e0e421
 		;;
e0e421
 	-solaris1 | -solaris1.*)
e0e421
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
e0e421
@@ -1287,14 +1357,15 @@
e0e421
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
e0e421
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
e0e421
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
e0e421
-	      | -openbsd* | -solidbsd* \
e0e421
+	      | -bitrig* | -openbsd* | -solidbsd* \
e0e421
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
e0e421
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
e0e421
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
e0e421
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
e0e421
 	      | -chorusos* | -chorusrdb* | -cegcc* \
e0e421
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
e0e421
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
e0e421
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
e0e421
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
e0e421
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
e0e421
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
e0e421
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
e0e421
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
e0e421
@@ -1341,7 +1412,7 @@
e0e421
 	-opened*)
e0e421
 		os=-openedition
e0e421
 		;;
e0e421
-        -os400*)
e0e421
+	-os400*)
e0e421
 		os=-os400
e0e421
 		;;
e0e421
 	-wince*)
e0e421
@@ -1390,7 +1461,7 @@
e0e421
 	-sinix*)
e0e421
 		os=-sysv4
e0e421
 		;;
e0e421
-        -tpf*)
e0e421
+	-tpf*)
e0e421
 		os=-tpf
e0e421
 		;;
e0e421
 	-triton*)
e0e421
@@ -1435,6 +1506,8 @@
e0e421
 	-dicos*)
e0e421
 		os=-dicos
e0e421
 		;;
e0e421
+	-nacl*)
e0e421
+		;;
e0e421
 	-none)
e0e421
 		;;
e0e421
 	*)
e0e421
@@ -1457,10 +1530,10 @@
e0e421
 # system, and we'll never get to this point.
e0e421
 
e0e421
 case $basic_machine in
e0e421
-        score-*)
e0e421
+	score-*)
e0e421
 		os=-elf
e0e421
 		;;
e0e421
-        spu-*)
e0e421
+	spu-*)
e0e421
 		os=-elf
e0e421
 		;;
e0e421
 	*-acorn)
e0e421
@@ -1472,8 +1545,20 @@
e0e421
 	arm*-semi)
e0e421
 		os=-aout
e0e421
 		;;
e0e421
-        c4x-* | tic4x-*)
e0e421
-        	os=-coff
e0e421
+	c4x-* | tic4x-*)
e0e421
+		os=-coff
e0e421
+		;;
e0e421
+	hexagon-*)
e0e421
+		os=-elf
e0e421
+		;;
e0e421
+	tic54x-*)
e0e421
+		os=-coff
e0e421
+		;;
e0e421
+	tic55x-*)
e0e421
+		os=-coff
e0e421
+		;;
e0e421
+	tic6x-*)
e0e421
+		os=-coff
e0e421
 		;;
e0e421
 	# This must come before the *-dec entry.
e0e421
 	pdp10-*)
e0e421
@@ -1493,14 +1578,11 @@
e0e421
 		;;
e0e421
 	m68000-sun)
e0e421
 		os=-sunos3
e0e421
-		# This also exists in the configure program, but was not the
e0e421
-		# default.
e0e421
-		# os=-sunos4
e0e421
 		;;
e0e421
 	m68*-cisco)
e0e421
 		os=-aout
e0e421
 		;;
e0e421
-        mep-*)
e0e421
+	mep-*)
e0e421
 		os=-elf
e0e421
 		;;
e0e421
 	mips*-cisco)
e0e421
@@ -1527,7 +1609,7 @@
e0e421
 	*-ibm)
e0e421
 		os=-aix
e0e421
 		;;
e0e421
-    	*-knuth)
e0e421
+	*-knuth)
e0e421
 		os=-mmixware
e0e421
 		;;
e0e421
 	*-wec)