b938b03
diff -urN dejagnu-1.5/config.guess dejagnu-1.5-aarch64/config.guess
b938b03
--- dejagnu-1.5/config.guess	2011-03-03 04:01:07.000000000 -0600
b938b03
+++ dejagnu-1.5-aarch64/config.guess	2013-03-03 04:11:34.751854073 -0600
b938b03
@@ -2,9 +2,9 @@
b938b03
 # Attempt to guess a canonical system name.
b938b03
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
b938b03
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
b938b03
-#   2011 Free Software Foundation, Inc.
b938b03
+#   2011, 2012 Free Software Foundation, Inc.
b938b03
 
b938b03
-timestamp='2011-02-02'
b938b03
+timestamp='2012-09-25'
b938b03
 
b938b03
 # This file is free software; you can redistribute it and/or modify it
b938b03
 # under the terms of the GNU General Public License as published by
b938b03
@@ -17,9 +17,7 @@
b938b03
 # General Public License for more details.
b938b03
 #
b938b03
 # You should have received a copy of the GNU General Public License
b938b03
-# along with this program; if not, write to the Free Software
b938b03
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
b938b03
-# 02110-1301, USA.
b938b03
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
b938b03
 #
b938b03
 # As a special exception to the GNU General Public License, if you
b938b03
 # distribute this file as part of a program that contains a
b938b03
@@ -57,8 +55,8 @@
b938b03
 
b938b03
 Originally written by Per Bothner.
b938b03
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
b938b03
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
b938b03
-Software Foundation, Inc.
b938b03
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
b938b03
+Free Software Foundation, Inc.
b938b03
 
b938b03
 This is free software; see the source for copying conditions.  There is NO
b938b03
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
b938b03
@@ -145,7 +143,7 @@
b938b03
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
b938b03
     *:NetBSD:*:*)
b938b03
 	# NetBSD (nbsd) targets should (where applicable) match one or
b938b03
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
b938b03
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
b938b03
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
b938b03
 	# switched to ELF, *-*-netbsd* would select the old
b938b03
 	# object file format.  This provides both forward
b938b03
@@ -202,6 +200,10 @@
b938b03
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
b938b03
 	echo "${machine}-${os}${release}"
b938b03
 	exit ;;
b938b03
+    *:Bitrig:*:*)
b938b03
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
b938b03
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
b938b03
+	exit ;;
b938b03
     *:OpenBSD:*:*)
b938b03
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
b938b03
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
b938b03
@@ -304,7 +306,7 @@
b938b03
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
b938b03
 	echo arm-acorn-riscix${UNAME_RELEASE}
b938b03
 	exit ;;
b938b03
-    arm:riscos:*:*|arm:RISCOS:*:*)
b938b03
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
b938b03
 	echo arm-unknown-riscos
b938b03
 	exit ;;
b938b03
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
b938b03
@@ -792,21 +794,26 @@
b938b03
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
b938b03
 	exit ;;
b938b03
     *:FreeBSD:*:*)
b938b03
-	case ${UNAME_MACHINE} in
b938b03
-	    pc98)
b938b03
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
b938b03
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
b938b03
+	case ${UNAME_PROCESSOR} in
b938b03
 	    amd64)
b938b03
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
b938b03
 	    *)
b938b03
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
b938b03
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
b938b03
 	esac
b938b03
 	exit ;;
b938b03
     i*:CYGWIN*:*)
b938b03
 	echo ${UNAME_MACHINE}-pc-cygwin
b938b03
 	exit ;;
b938b03
+    *:MINGW64*:*)
b938b03
+	echo ${UNAME_MACHINE}-pc-mingw64
b938b03
+	exit ;;
b938b03
     *:MINGW*:*)
b938b03
 	echo ${UNAME_MACHINE}-pc-mingw32
b938b03
 	exit ;;
b938b03
+    i*:MSYS*:*)
b938b03
+	echo ${UNAME_MACHINE}-pc-msys
b938b03
+	exit ;;
b938b03
     i*:windows32*:*)
b938b03
 	# uname -m includes "-pc" on this system.
b938b03
 	echo ${UNAME_MACHINE}-mingw32
b938b03
@@ -861,6 +868,13 @@
b938b03
     i*86:Minix:*:*)
b938b03
 	echo ${UNAME_MACHINE}-pc-minix
b938b03
 	exit ;;
b938b03
+    aarch64:Linux:*:*)
b938b03
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
b938b03
+	exit ;;
b938b03
+    aarch64_be:Linux:*:*)
b938b03
+	UNAME_MACHINE=aarch64_be
b938b03
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
b938b03
+	exit ;;
b938b03
     alpha:Linux:*:*)
b938b03
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
b938b03
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
b938b03
@@ -882,20 +896,29 @@
b938b03
 	then
b938b03
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
b938b03
 	else
b938b03
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
b938b03
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
b938b03
+		| grep -q __ARM_PCS_VFP
b938b03
+	    then
b938b03
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
b938b03
+	    else
b938b03
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
b938b03
+	    fi
b938b03
 	fi
b938b03
 	exit ;;
b938b03
     avr32*:Linux:*:*)
b938b03
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
b938b03
 	exit ;;
b938b03
     cris:Linux:*:*)
b938b03
-	echo cris-axis-linux-gnu
b938b03
+	echo ${UNAME_MACHINE}-axis-linux-gnu
b938b03
 	exit ;;
b938b03
     crisv32:Linux:*:*)
b938b03
-	echo crisv32-axis-linux-gnu
b938b03
+	echo ${UNAME_MACHINE}-axis-linux-gnu
b938b03
 	exit ;;
b938b03
     frv:Linux:*:*)
b938b03
-	echo frv-unknown-linux-gnu
b938b03
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
b938b03
+	exit ;;
b938b03
+    hexagon:Linux:*:*)
b938b03
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
b938b03
 	exit ;;
b938b03
     i*86:Linux:*:*)
b938b03
 	LIBC=gnu
b938b03
@@ -937,7 +960,7 @@
b938b03
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
b938b03
 	;;
b938b03
     or32:Linux:*:*)
b938b03
-	echo or32-unknown-linux-gnu
b938b03
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
b938b03
 	exit ;;
b938b03
     padre:Linux:*:*)
b938b03
 	echo sparc-unknown-linux-gnu
b938b03
@@ -972,13 +995,13 @@
b938b03
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
b938b03
 	exit ;;
b938b03
     tile*:Linux:*:*)
b938b03
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
b938b03
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
b938b03
 	exit ;;
b938b03
     vax:Linux:*:*)
b938b03
 	echo ${UNAME_MACHINE}-dec-linux-gnu
b938b03
 	exit ;;
b938b03
     x86_64:Linux:*:*)
b938b03
-	echo x86_64-unknown-linux-gnu
b938b03
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
b938b03
 	exit ;;
b938b03
     xtensa*:Linux:*:*)
b938b03
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
b938b03
@@ -1185,6 +1208,9 @@
b938b03
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
b938b03
 	echo i586-pc-haiku
b938b03
 	exit ;;
b938b03
+    x86_64:Haiku:*:*)
b938b03
+	echo x86_64-unknown-haiku
b938b03
+	exit ;;
b938b03
     SX-4:SUPER-UX:*:*)
b938b03
 	echo sx4-nec-superux${UNAME_RELEASE}
b938b03
 	exit ;;
b938b03
@@ -1240,7 +1266,7 @@
b938b03
     NEO-?:NONSTOP_KERNEL:*:*)
b938b03
 	echo neo-tandem-nsk${UNAME_RELEASE}
b938b03
 	exit ;;
b938b03
-    NSE-?:NONSTOP_KERNEL:*:*)
b938b03
+    NSE-*:NONSTOP_KERNEL:*:*)
b938b03
 	echo nse-tandem-nsk${UNAME_RELEASE}
b938b03
 	exit ;;
b938b03
     NSR-?:NONSTOP_KERNEL:*:*)
b938b03
@@ -1309,11 +1335,11 @@
b938b03
     i*86:AROS:*:*)
b938b03
 	echo ${UNAME_MACHINE}-pc-aros
b938b03
 	exit ;;
b938b03
+    x86_64:VMkernel:*:*)
b938b03
+	echo ${UNAME_MACHINE}-unknown-esx
b938b03
+	exit ;;
b938b03
 esac
b938b03
 
b938b03
-#echo '(No uname command or uname output not recognized.)' 1>&2
b938b03
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
b938b03
-
b938b03
 eval $set_cc_for_build
b938b03
 cat >$dummy.c <
b938b03
 #ifdef _SEQUENT_
b938b03
diff -urN dejagnu-1.5/config.sub dejagnu-1.5-aarch64/config.sub
b938b03
--- dejagnu-1.5/config.sub	2011-03-03 04:01:07.000000000 -0600
b938b03
+++ dejagnu-1.5-aarch64/config.sub	2013-03-03 04:11:34.789849678 -0600
b938b03
@@ -2,9 +2,9 @@
b938b03
 # Configuration validation subroutine script.
b938b03
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
b938b03
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
b938b03
-#   2011 Free Software Foundation, Inc.
b938b03
+#   2011, 2012 Free Software Foundation, Inc.
b938b03
 
b938b03
-timestamp='2011-02-24'
b938b03
+timestamp='2012-10-10'
b938b03
 
b938b03
 # This file is (in principle) common to ALL GNU software.
b938b03
 # The presence of a machine in this file suggests that SOME GNU software
b938b03
@@ -21,9 +21,7 @@
b938b03
 # GNU General Public License for more details.
b938b03
 #
b938b03
 # You should have received a copy of the GNU General Public License
b938b03
-# along with this program; if not, write to the Free Software
b938b03
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
b938b03
-# 02110-1301, USA.
b938b03
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
b938b03
 #
b938b03
 # As a special exception to the GNU General Public License, if you
b938b03
 # distribute this file as part of a program that contains a
b938b03
@@ -76,8 +74,8 @@
b938b03
 GNU config.sub ($timestamp)
b938b03
 
b938b03
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
b938b03
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
b938b03
-Software Foundation, Inc.
b938b03
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
b938b03
+Free Software Foundation, Inc.
b938b03
 
b938b03
 This is free software; see the source for copying conditions.  There is NO
b938b03
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
b938b03
@@ -125,13 +123,17 @@
b938b03
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
b938b03
 case $maybe_os in
b938b03
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
b938b03
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
b938b03
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
b938b03
   knetbsd*-gnu* | netbsd*-gnu* | \
b938b03
   kopensolaris*-gnu* | \
b938b03
   storm-chaos* | os2-emx* | rtmk-nova*)
b938b03
     os=-$maybe_os
b938b03
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
b938b03
     ;;
b938b03
+  android-linux)
b938b03
+    os=-linux-android
b938b03
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
b938b03
+    ;;
b938b03
   *)
b938b03
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
b938b03
     if [ $basic_machine != $1 ]
b938b03
@@ -154,7 +156,7 @@
b938b03
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
b938b03
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
b938b03
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
b938b03
-	-apple | -axis | -knuth | -cray | -microblaze)
b938b03
+	-apple | -axis | -knuth | -cray | -microblaze*)
b938b03
 		os=
b938b03
 		basic_machine=$1
b938b03
 		;;
b938b03
@@ -223,6 +225,12 @@
b938b03
 	-isc*)
b938b03
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
b938b03
 		;;
b938b03
+	-lynx*178)
b938b03
+		os=-lynxos178
b938b03
+		;;
b938b03
+	-lynx*5)
b938b03
+		os=-lynxos5
b938b03
+		;;
b938b03
 	-lynx*)
b938b03
 		os=-lynxos
b938b03
 		;;
b938b03
@@ -247,20 +255,25 @@
b938b03
 	# Some are omitted here because they have special meanings below.
b938b03
 	1750a | 580 \
b938b03
 	| a29k \
b938b03
+	| aarch64 | aarch64_be \
b938b03
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
b938b03
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
b938b03
 	| am33_2.0 \
b938b03
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
b938b03
+        | be32 | be64 \
b938b03
 	| bfin \
b938b03
 	| c4x | clipper \
b938b03
 	| d10v | d30v | dlx | dsp16xx \
b938b03
+	| epiphany \
b938b03
 	| fido | fr30 | frv \
b938b03
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
b938b03
+	| hexagon \
b938b03
 	| i370 | i860 | i960 | ia64 \
b938b03
 	| ip2k | iq2000 \
b938b03
+	| le32 | le64 \
b938b03
 	| lm32 \
b938b03
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
b938b03
-	| maxq | mb | microblaze | mcore | mep | metag \
b938b03
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
b938b03
 	| mips | mipsbe | mipseb | mipsel | mipsle \
b938b03
 	| mips16 \
b938b03
 	| mips64 | mips64el \
b938b03
@@ -286,22 +299,23 @@
b938b03
 	| nds32 | nds32le | nds32be \
b938b03
 	| nios | nios2 \
b938b03
 	| ns16k | ns32k \
b938b03
+	| open8 \
b938b03
 	| or32 \
b938b03
 	| pdp10 | pdp11 | pj | pjl \
b938b03
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
b938b03
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
b938b03
 	| pyramid \
b938b03
-	| rx \
b938b03
+	| rl78 | rx \
b938b03
 	| score \
b938b03
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
b938b03
 	| sh64 | sh64le \
b938b03
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
b938b03
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
b938b03
-	| spu | strongarm \
b938b03
-	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
b938b03
+	| spu \
b938b03
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
b938b03
 	| ubicom32 \
b938b03
-	| v850 | v850e \
b938b03
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
b938b03
 	| we32k \
b938b03
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
b938b03
+	| x86 | xc16x | xstormy16 | xtensa \
b938b03
 	| z8k | z80)
b938b03
 		basic_machine=$basic_machine-unknown
b938b03
 		;;
b938b03
@@ -314,8 +328,7 @@
b938b03
 	c6x)
b938b03
 		basic_machine=tic6x-unknown
b938b03
 		;;
b938b03
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
b938b03
-		# Motorola 68HC11/12.
b938b03
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
b938b03
 		basic_machine=$basic_machine-unknown
b938b03
 		os=-none
b938b03
 		;;
b938b03
@@ -325,6 +338,21 @@
b938b03
 		basic_machine=mt-unknown
b938b03
 		;;
b938b03
 
b938b03
+	strongarm | thumb | xscale)
b938b03
+		basic_machine=arm-unknown
b938b03
+		;;
b938b03
+	xgate)
b938b03
+		basic_machine=$basic_machine-unknown
b938b03
+		os=-none
b938b03
+		;;
b938b03
+	xscaleeb)
b938b03
+		basic_machine=armeb-unknown
b938b03
+		;;
b938b03
+
b938b03
+	xscaleel)
b938b03
+		basic_machine=armel-unknown
b938b03
+		;;
b938b03
+
b938b03
 	# We use `pc' rather than `unknown'
b938b03
 	# because (1) that's what they normally are, and
b938b03
 	# (2) the word "unknown" tends to confuse beginning users.
b938b03
@@ -339,11 +367,13 @@
b938b03
 	# Recognize the basic CPU types with company name.
b938b03
 	580-* \
b938b03
 	| a29k-* \
b938b03
+	| aarch64-* | aarch64_be-* \
b938b03
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
b938b03
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
b938b03
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
b938b03
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
b938b03
 	| avr-* | avr32-* \
b938b03
+	| be32-* | be64-* \
b938b03
 	| bfin-* | bs2000-* \
b938b03
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
b938b03
 	| clipper-* | craynv-* | cydra-* \
b938b03
@@ -352,12 +382,15 @@
b938b03
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
b938b03
 	| h8300-* | h8500-* \
b938b03
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
b938b03
+	| hexagon-* \
b938b03
 	| i*86-* | i860-* | i960-* | ia64-* \
b938b03
 	| ip2k-* | iq2000-* \
b938b03
+	| le32-* | le64-* \
b938b03
 	| lm32-* \
b938b03
 	| m32c-* | m32r-* | m32rle-* \
b938b03
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
b938b03
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
b938b03
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
b938b03
+	| microblaze-* | microblazeel-* \
b938b03
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
b938b03
 	| mips16-* \
b938b03
 	| mips64-* | mips64el-* \
b938b03
@@ -382,24 +415,26 @@
b938b03
 	| nds32-* | nds32le-* | nds32be-* \
b938b03
 	| nios-* | nios2-* \
b938b03
 	| none-* | np1-* | ns16k-* | ns32k-* \
b938b03
+	| open8-* \
b938b03
 	| orion-* \
b938b03
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
b938b03
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
b938b03
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
b938b03
 	| pyramid-* \
b938b03
-	| romp-* | rs6000-* | rx-* \
b938b03
+	| rl78-* | romp-* | rs6000-* | rx-* \
b938b03
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
b938b03
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
b938b03
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
b938b03
 	| sparclite-* \
b938b03
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
b938b03
-	| tahoe-* | thumb-* \
b938b03
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
b938b03
+	| tahoe-* \
b938b03
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
b938b03
-	| tile-* | tilegx-* \
b938b03
+	| tile*-* \
b938b03
 	| tron-* \
b938b03
 	| ubicom32-* \
b938b03
-	| v850-* | v850e-* | vax-* \
b938b03
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
b938b03
+	| vax-* \
b938b03
 	| we32k-* \
b938b03
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
b938b03
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
b938b03
 	| xstormy16-* | xtensa*-* \
b938b03
 	| ymp-* \
b938b03
 	| z8k-* | z80-*)
b938b03
@@ -697,7 +732,6 @@
b938b03
 	i370-ibm* | ibm*)
b938b03
 		basic_machine=i370-ibm
b938b03
 		;;
b938b03
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
b938b03
 	i*86v32)
b938b03
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
b938b03
 		os=-sysv32
b938b03
@@ -755,9 +789,13 @@
b938b03
 		basic_machine=ns32k-utek
b938b03
 		os=-sysv
b938b03
 		;;
b938b03
-	microblaze)
b938b03
+	microblaze*)
b938b03
 		basic_machine=microblaze-xilinx
b938b03
 		;;
b938b03
+	mingw64)
b938b03
+		basic_machine=x86_64-pc
b938b03
+		os=-mingw64
b938b03
+		;;
b938b03
 	mingw32)
b938b03
 		basic_machine=i386-pc
b938b03
 		os=-mingw32
b938b03
@@ -794,10 +832,18 @@
b938b03
 	ms1-*)
b938b03
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
b938b03
 		;;
b938b03
+	msys)
b938b03
+		basic_machine=i386-pc
b938b03
+		os=-msys
b938b03
+		;;
b938b03
 	mvs)
b938b03
 		basic_machine=i370-ibm
b938b03
 		os=-mvs
b938b03
 		;;
b938b03
+	nacl)
b938b03
+		basic_machine=le32-unknown
b938b03
+		os=-nacl
b938b03
+		;;
b938b03
 	ncr3000)
b938b03
 		basic_machine=i486-ncr
b938b03
 		os=-sysv4
b938b03
@@ -950,9 +996,10 @@
b938b03
 		;;
b938b03
 	power)	basic_machine=power-ibm
b938b03
 		;;
b938b03
-	ppc)	basic_machine=powerpc-unknown
b938b03
+	ppc | ppcbe)	basic_machine=powerpc-unknown
b938b03
 		;;
b938b03
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
b938b03
+	ppc-* | ppcbe-*)
b938b03
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
b938b03
 		;;
b938b03
 	ppcle | powerpclittle | ppc-le | powerpc-little)
b938b03
 		basic_machine=powerpcle-unknown
b938b03
@@ -1046,6 +1093,9 @@
b938b03
 		basic_machine=i860-stratus
b938b03
 		os=-sysv4
b938b03
 		;;
b938b03
+	strongarm-* | thumb-*)
b938b03
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
b938b03
+		;;
b938b03
 	sun2)
b938b03
 		basic_machine=m68000-sun
b938b03
 		;;
b938b03
@@ -1102,13 +1152,8 @@
b938b03
 		basic_machine=t90-cray
b938b03
 		os=-unicos
b938b03
 		;;
b938b03
-	# This must be matched before tile*.
b938b03
-	tilegx*)
b938b03
-		basic_machine=tilegx-unknown
b938b03
-		os=-linux-gnu
b938b03
-		;;
b938b03
 	tile*)
b938b03
-		basic_machine=tile-unknown
b938b03
+		basic_machine=$basic_machine-unknown
b938b03
 		os=-linux-gnu
b938b03
 		;;
b938b03
 	tx39)
b938b03
@@ -1178,6 +1223,9 @@
b938b03
 	xps | xps100)
b938b03
 		basic_machine=xps100-honeywell
b938b03
 		;;
b938b03
+	xscale-* | xscalee[bl]-*)
b938b03
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
b938b03
+		;;
b938b03
 	ymp)
b938b03
 		basic_machine=ymp-cray
b938b03
 		os=-unicos
b938b03
@@ -1309,15 +1357,15 @@
b938b03
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
b938b03
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
b938b03
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
b938b03
-	      | -openbsd* | -solidbsd* \
b938b03
+	      | -bitrig* | -openbsd* | -solidbsd* \
b938b03
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
b938b03
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
b938b03
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
b938b03
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
b938b03
 	      | -chorusos* | -chorusrdb* | -cegcc* \
b938b03
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
b938b03
-	      | -mingw32* | -linux-gnu* | -linux-android* \
b938b03
-	      | -linux-newlib* | -linux-uclibc* \
b938b03
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
b938b03
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
b938b03
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
b938b03
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
b938b03
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
b938b03
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
b938b03
@@ -1500,6 +1548,9 @@
b938b03
 	c4x-* | tic4x-*)
b938b03
 		os=-coff
b938b03
 		;;
b938b03
+	hexagon-*)
b938b03
+		os=-elf
b938b03
+		;;
b938b03
 	tic54x-*)
b938b03
 		os=-coff
b938b03
 		;;
b938b03
@@ -1527,9 +1578,6 @@
b938b03
 		;;
b938b03
 	m68000-sun)
b938b03
 		os=-sunos3
b938b03
-		# This also exists in the configure program, but was not the
b938b03
-		# default.
b938b03
-		# os=-sunos4
b938b03
 		;;
b938b03
 	m68*-cisco)
b938b03
 		os=-aout