ongrep

A cleaned up fork of ngrep for OpenBSD
git clone git://git.sgregoratto.me/ongrep
Log | Files | Refs | README | LICENSE
commit 61ad4ae1e16cf200273a6c5e646773a64f200c92
parent 66b7a47093db1a3917d639cc3c9cacb3512f8149
Author: Jordan Ritter <jpr5@darkridge.com>
Date:   Wed,  6 Sep 2017 10:28:47 -0700

Update to latest autotools config.*

Diffstat:

Mconfig.guess | 206++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------


Mconfig.sub | 3263++++++++++++++++++++++++++++++++++++++++---------------------------------------


2 files changed, 1784 insertions(+), 1685 deletions(-)

diff --git a/config.guess b/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2014-02-12'
+timestamp='2017-08-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2014-02-12'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		os=netbsdelf
+		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -197,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -207,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -235,6 +256,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
+    *:Redox:*:*)
+	echo ${UNAME_MACHINE}-unknown-redox
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -251,42 +278,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -359,16 +386,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -393,7 +420,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -579,8 +606,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -617,13 +645,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -662,11 +690,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -679,12 +707,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -789,14 +817,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -812,10 +840,11 @@ EOF
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case ${UNAME_PROCESSOR} in
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
 	esac
+	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -826,7 +855,7 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -878,7 +907,7 @@ EOF
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -901,7 +930,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -932,6 +961,9 @@ EOF
     crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -944,6 +976,9 @@ EOF
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -969,10 +1004,13 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or1k:Linux:*:*)
+    mips64el:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
-    or32:Linux:*:*)
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
@@ -1001,6 +1039,9 @@ EOF
     ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
@@ -1020,7 +1061,7 @@ EOF
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1099,7 +1140,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1248,6 +1289,9 @@ EOF
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1261,16 +1305,23 @@ EOF
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
 			i386) UNAME_PROCESSOR=x86_64 ;;
 			powerpc) UNAME_PROCESSOR=powerpc64 ;;
 		    esac
 		fi
+		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_PPC >/dev/null
+		then
+		    UNAME_PROCESSOR=powerpc
+		fi
 	    fi
 	elif test "$UNAME_PROCESSOR" = i386 ; then
 	    # Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1285,7 +1336,7 @@ EOF
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1294,15 +1345,18 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
+    NEO-*:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+    NSR-*:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit ;;
+    NSX-*:NONSTOP_KERNEL:*:*)
+	echo nsx-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
 	exit ;;
@@ -1316,7 +1370,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1358,7 +1412,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1369,23 +1423,25 @@ EOF
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
diff --git a/config.sub b/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2014-01-01'
+timestamp='2017-04-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2014-01-01'
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -33,7 +33,7 @@ timestamp='2014-01-01'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -45,16 +45,15 @@ timestamp='2014-01-01'
 
 # The goal of this file is to map all the various variations of a given
 # machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+#   CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
 # or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+#   CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -87,7 +86,7 @@ while test $# -gt 0 ; do
        echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
-    - )	# Use stdin as input.
+    - ) # Use stdin as input.
        break ;;
     -* )
        echo "$me: invalid option $1$help"
@@ -117,8 +116,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -140,1185 +139,1226 @@ esac
 ### recognize some manufacturers as not being operating systems, so we
 ### can provide default operating systems below.
 case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
+    -sun*os*)
+        # Prevent following clause from handling this invalid input.
+        ;;
+    -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+    -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+    -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+    -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+    -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+    -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+    -apple | -axis | -knuth | -cray | -microblaze*)
+        os=
+        basic_machine=$1
+        ;;
+    -bluegene*)
+        os=-cnk
+        ;;
+    -sim | -cisco | -oki | -wec | -winbond)
+        os=
+        basic_machine=$1
+        ;;
+    -scout)
+        ;;
+    -wrs)
+        os=-vxworks
+        basic_machine=$1
+        ;;
+    -chorusos*)
+        os=-chorusos
+        basic_machine=$1
+        ;;
+    -chorusrdb)
+        os=-chorusrdb
+        basic_machine=$1
+        ;;
+    -hiux*)
+        os=-hiuxwe2
+        ;;
+    -sco6)
+        os=-sco5v6
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -sco5)
+        os=-sco3.2v5
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -sco4)
+        os=-sco3.2v4
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -sco3.2.[4-9]*)
+        os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -sco3.2v[4-9]*)
+        # Don't forget version if it is 3.2v4 or newer.
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -sco5v6*)
+        # Don't forget version if it is 3.2v4 or newer.
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -sco*)
+        os=-sco3.2v2
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -udk*)
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -isc)
+        os=-isc2.2
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -clix*)
+        basic_machine=clipper-intergraph
+        ;;
+    -isc*)
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -lynx*178)
+        os=-lynxos178
+        ;;
+    -lynx*5)
+        os=-lynxos5
+        ;;
+    -lynx*)
+        os=-lynxos
+        ;;
+    -ptx*)
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+        ;;
+    -windowsnt*)
+        os=`echo $os | sed -e 's/windowsnt/winnt/'`
+        ;;
+    -psos*)
+        os=-psos
+        ;;
+    -mint | -mint[0-9]*)
+        basic_machine=m68k-atari
+        os=-mint
+        ;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pyramid \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
+    # Recognize the basic CPU types without company name.
+    # Some are omitted here because they have special meanings below.
+    1750a | 580 \
+    | a29k \
+    | aarch64 | aarch64_be \
+    | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+    | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+    | am33_2.0 \
+    | arc | arceb \
+    | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+    | avr | avr32 \
+    | ba \
+    | be32 | be64 \
+    | bfin \
+    | c4x | c8051 | clipper \
+    | d10v | d30v | dlx | dsp16xx \
+    | e2k | epiphany \
+    | fido | fr30 | frv | ft32 \
+    | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+    | hexagon \
+    | i370 | i860 | i960 | ia16 | ia64 \
+    | ip2k | iq2000 \
+    | k1om \
+    | le32 | le64 \
+    | lm32 \
+    | m32c | m32r | m32rle | m68000 | m68k | m88k \
+    | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+    | mips | mipsbe | mipseb | mipsel | mipsle \
+    | mips16 \
+    | mips64 | mips64el \
+    | mips64octeon | mips64octeonel \
+    | mips64orion | mips64orionel \
+    | mips64r5900 | mips64r5900el \
+    | mips64vr | mips64vrel \
+    | mips64vr4100 | mips64vr4100el \
+    | mips64vr4300 | mips64vr4300el \
+    | mips64vr5000 | mips64vr5000el \
+    | mips64vr5900 | mips64vr5900el \
+    | mipsisa32 | mipsisa32el \
+    | mipsisa32r2 | mipsisa32r2el \
+    | mipsisa32r6 | mipsisa32r6el \
+    | mipsisa64 | mipsisa64el \
+    | mipsisa64r2 | mipsisa64r2el \
+    | mipsisa64r6 | mipsisa64r6el \
+    | mipsisa64sb1 | mipsisa64sb1el \
+    | mipsisa64sr71k | mipsisa64sr71kel \
+    | mipsr5900 | mipsr5900el \
+    | mipstx39 | mipstx39el \
+    | mn10200 | mn10300 \
+    | moxie \
+    | mt \
+    | msp430 \
+    | nds32 | nds32le | nds32be \
+    | nios | nios2 | nios2eb | nios2el \
+    | ns16k | ns32k \
+    | open8 | or1k | or1knd | or32 \
+    | pdp10 | pdp11 | pj | pjl \
+    | powerpc | powerpc64 | powerpc64le | powerpcle \
+    | pru \
+    | pyramid \
+    | riscv32 | riscv64 \
+    | rl78 | rx \
+    | score \
+    | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+    | sh64 | sh64le \
+    | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+    | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+    | spu \
+    | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+    | ubicom32 \
+    | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+    | visium \
+    | wasm32 \
+    | we32k \
+    | x86 | xc16x | xstormy16 | xtensa \
+    | z8k | z80)
+        basic_machine=$basic_machine-unknown
+        ;;
+    c54x)
+        basic_machine=tic54x-unknown
+        ;;
+    c55x)
+        basic_machine=tic55x-unknown
+        ;;
+    c6x)
+        basic_machine=tic6x-unknown
+        ;;
+    leon|leon[3-9])
+        basic_machine=sparc-$basic_machine
+        ;;
+    m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+        basic_machine=$basic_machine-unknown
+        os=-none
+        ;;
+    m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+        ;;
+    ms1)
+        basic_machine=mt-unknown
+        ;;
 
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
+    strongarm | thumb | xscale)
+        basic_machine=arm-unknown
+        ;;
+    xgate)
+        basic_machine=$basic_machine-unknown
+        os=-none
+        ;;
+    xscaleeb)
+        basic_machine=armeb-unknown
+        ;;
 
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
+    xscaleel)
+        basic_machine=armel-unknown
+        ;;
 
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
+    # We use `pc' rather than `unknown'
+    # because (1) that's what they normally are, and
+    # (2) the word "unknown" tends to confuse beginning users.
+    i*86 | x86_64)
+      basic_machine=$basic_machine-pc
+      ;;
+    # Object if more than one company name word.
+    *-*-*)
+        echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+        exit 1
+        ;;
+    # Recognize the basic CPU types with company name.
+    580-* \
+    | a29k-* \
+    | aarch64-* | aarch64_be-* \
+    | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+    | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+    | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+    | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+    | avr-* | avr32-* \
+    | ba-* \
+    | be32-* | be64-* \
+    | bfin-* | bs2000-* \
+    | c[123]* | c30-* | [cjt]90-* | c4x-* \
+    | c8051-* | clipper-* | craynv-* | cydra-* \
+    | d10v-* | d30v-* | dlx-* \
+    | e2k-* | elxsi-* \
+    | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+    | h8300-* | h8500-* \
+    | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+    | hexagon-* \
+    | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
+    | ip2k-* | iq2000-* \
+    | k1om-* \
+    | le32-* | le64-* \
+    | lm32-* \
+    | m32c-* | m32r-* | m32rle-* \
+    | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+    | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+    | microblaze-* | microblazeel-* \
+    | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+    | mips16-* \
+    | mips64-* | mips64el-* \
+    | mips64octeon-* | mips64octeonel-* \
+    | mips64orion-* | mips64orionel-* \
+    | mips64r5900-* | mips64r5900el-* \
+    | mips64vr-* | mips64vrel-* \
+    | mips64vr4100-* | mips64vr4100el-* \
+    | mips64vr4300-* | mips64vr4300el-* \
+    | mips64vr5000-* | mips64vr5000el-* \
+    | mips64vr5900-* | mips64vr5900el-* \
+    | mipsisa32-* | mipsisa32el-* \
+    | mipsisa32r2-* | mipsisa32r2el-* \
+    | mipsisa32r6-* | mipsisa32r6el-* \
+    | mipsisa64-* | mipsisa64el-* \
+    | mipsisa64r2-* | mipsisa64r2el-* \
+    | mipsisa64r6-* | mipsisa64r6el-* \
+    | mipsisa64sb1-* | mipsisa64sb1el-* \
+    | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+    | mipsr5900-* | mipsr5900el-* \
+    | mipstx39-* | mipstx39el-* \
+    | mmix-* \
+    | mt-* \
+    | msp430-* \
+    | nds32-* | nds32le-* | nds32be-* \
+    | nios-* | nios2-* | nios2eb-* | nios2el-* \
+    | none-* | np1-* | ns16k-* | ns32k-* \
+    | open8-* \
+    | or1k*-* \
+    | orion-* \
+    | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+    | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+    | pru-* \
+    | pyramid-* \
+    | riscv32-* | riscv64-* \
+    | rl78-* | romp-* | rs6000-* | rx-* \
+    | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+    | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+    | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+    | sparclite-* \
+    | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+    | tahoe-* \
+    | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+    | tile*-* \
+    | tron-* \
+    | ubicom32-* \
+    | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+    | vax-* \
+    | visium-* \
+    | wasm32-* \
+    | we32k-* \
+    | x86-* | x86_64-* | xc16x-* | xps100-* \
+    | xstormy16-* | xtensa*-* \
+    | ymp-* \
+    | z8k-* | z80-*)
+        ;;
+    # Recognize the basic CPU types without company name, with glob match.
+    xtensa*)
+        basic_machine=$basic_machine-unknown
+        ;;
+    # Recognize the various machine names and aliases which stand
+    # for a CPU type and a company and sometimes even an OS.
+    386bsd)
+        basic_machine=i386-unknown
+        os=-bsd
+        ;;
+    3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+        basic_machine=m68000-att
+        ;;
+    3b*)
+        basic_machine=we32k-att
+        ;;
+    a29khif)
+        basic_machine=a29k-amd
+        os=-udi
+        ;;
+    abacus)
+        basic_machine=abacus-unknown
+        ;;
+    adobe68k)
+        basic_machine=m68010-adobe
+        os=-scout
+        ;;
+    alliant | fx80)
+        basic_machine=fx80-alliant
+        ;;
+    altos | altos3068)
+        basic_machine=m68k-altos
+        ;;
+    am29k)
+        basic_machine=a29k-none
+        os=-bsd
+        ;;
+    amd64)
+        basic_machine=x86_64-pc
+        ;;
+    amd64-*)
+        basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    amdahl)
+        basic_machine=580-amdahl
+        os=-sysv
+        ;;
+    amiga | amiga-*)
+        basic_machine=m68k-unknown
+        ;;
+    amigaos | amigados)
+        basic_machine=m68k-unknown
+        os=-amigaos
+        ;;
+    amigaunix | amix)
+        basic_machine=m68k-unknown
+        os=-sysv4
+        ;;
+    apollo68)
+        basic_machine=m68k-apollo
+        os=-sysv
+        ;;
+    apollo68bsd)
+        basic_machine=m68k-apollo
+        os=-bsd
+        ;;
+    aros)
+        basic_machine=i386-pc
+        os=-aros
+        ;;
+    asmjs)
+        basic_machine=asmjs-unknown
+        ;;
+    aux)
+        basic_machine=m68k-apple
+        os=-aux
+        ;;
+    balance)
+        basic_machine=ns32k-sequent
+        os=-dynix
+        ;;
+    blackfin)
+        basic_machine=bfin-unknown
+        os=-linux
+        ;;
+    blackfin-*)
+        basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+        os=-linux
+        ;;
+    bluegene*)
+        basic_machine=powerpc-ibm
+        os=-cnk
+        ;;
+    c54x-*)
+        basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    c55x-*)
+        basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    c6x-*)
+        basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    c90)
+        basic_machine=c90-cray
+        os=-unicos
+        ;;
+    cegcc)
+        basic_machine=arm-unknown
+        os=-cegcc
+        ;;
+    convex-c1)
+        basic_machine=c1-convex
+        os=-bsd
+        ;;
+    convex-c2)
+        basic_machine=c2-convex
+        os=-bsd
+        ;;
+    convex-c32)
+        basic_machine=c32-convex
+        os=-bsd
+        ;;
+    convex-c34)
+        basic_machine=c34-convex
+        os=-bsd
+        ;;
+    convex-c38)
+        basic_machine=c38-convex
+        os=-bsd
+        ;;
+    cray | j90)
+        basic_machine=j90-cray
+        os=-unicos
+        ;;
+    craynv)
+        basic_machine=craynv-cray
+        os=-unicosmp
+        ;;
+    cr16 | cr16-*)
+        basic_machine=cr16-unknown
+        os=-elf
+        ;;
+    crds | unos)
+        basic_machine=m68k-crds
+        ;;
+    crisv32 | crisv32-* | etraxfs*)
+        basic_machine=crisv32-axis
+        ;;
+    cris | cris-* | etrax*)
+        basic_machine=cris-axis
+        ;;
+    crx)
+        basic_machine=crx-unknown
+        os=-elf
+        ;;
+    da30 | da30-*)
+        basic_machine=m68k-da30
+        ;;
+    decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+        basic_machine=mips-dec
+        ;;
+    decsystem10* | dec10*)
+        basic_machine=pdp10-dec
+        os=-tops10
+        ;;
+    decsystem20* | dec20*)
+        basic_machine=pdp10-dec
+        os=-tops20
+        ;;
+    delta | 3300 | motorola-3300 | motorola-delta \
+          | 3300-motorola | delta-motorola)
+        basic_machine=m68k-motorola
+        ;;
+    delta88)
+        basic_machine=m88k-motorola
+        os=-sysv3
+        ;;
+    dicos)
+        basic_machine=i686-pc
+        os=-dicos
+        ;;
+    djgpp)
+        basic_machine=i586-pc
+        os=-msdosdjgpp
+        ;;
+    dpx20 | dpx20-*)
+        basic_machine=rs6000-bull
+        os=-bosx
+        ;;
+    dpx2* | dpx2*-bull)
+        basic_machine=m68k-bull
+        os=-sysv3
+        ;;
+    e500v[12])
+        basic_machine=powerpc-unknown
+        os=$os"spe"
+        ;;
+    e500v[12]-*)
+        basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+        os=$os"spe"
+        ;;
+    ebmon29k)
+        basic_machine=a29k-amd
+        os=-ebmon
+        ;;
+    elxsi)
+        basic_machine=elxsi-elxsi
+        os=-bsd
+        ;;
+    encore | umax | mmax)
+        basic_machine=ns32k-encore
+        ;;
+    es1800 | OSE68k | ose68k | ose | OSE)
+        basic_machine=m68k-ericsson
+        os=-ose
+        ;;
+    fx2800)
+        basic_machine=i860-alliant
+        ;;
+    genix)
+        basic_machine=ns32k-ns
+        ;;
+    gmicro)
+        basic_machine=tron-gmicro
+        os=-sysv
+        ;;
+    go32)
+        basic_machine=i386-pc
+        os=-go32
+        ;;
+    h3050r* | hiux*)
+        basic_machine=hppa1.1-hitachi
+        os=-hiuxwe2
+        ;;
+    h8300hms)
+        basic_machine=h8300-hitachi
+        os=-hms
+        ;;
+    h8300xray)
+        basic_machine=h8300-hitachi
+        os=-xray
+        ;;
+    h8500hms)
+        basic_machine=h8500-hitachi
+        os=-hms
+        ;;
+    harris)
+        basic_machine=m88k-harris
+        os=-sysv3
+        ;;
+    hp300-*)
+        basic_machine=m68k-hp
+        ;;
+    hp300bsd)
+        basic_machine=m68k-hp
+        os=-bsd
+        ;;
+    hp300hpux)
+        basic_machine=m68k-hp
+        os=-hpux
+        ;;
+    hp3k9[0-9][0-9] | hp9[0-9][0-9])
+        basic_machine=hppa1.0-hp
+        ;;
+    hp9k2[0-9][0-9] | hp9k31[0-9])
+        basic_machine=m68000-hp
+        ;;
+    hp9k3[2-9][0-9])
+        basic_machine=m68k-hp
+        ;;
+    hp9k6[0-9][0-9] | hp6[0-9][0-9])
+        basic_machine=hppa1.0-hp
+        ;;
+    hp9k7[0-79][0-9] | hp7[0-79][0-9])
+        basic_machine=hppa1.1-hp
+        ;;
+    hp9k78[0-9] | hp78[0-9])
+        # FIXME: really hppa2.0-hp
+        basic_machine=hppa1.1-hp
+        ;;
+    hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+        # FIXME: really hppa2.0-hp
+        basic_machine=hppa1.1-hp
+        ;;
+    hp9k8[0-9][13679] | hp8[0-9][13679])
+        basic_machine=hppa1.1-hp
+        ;;
+    hp9k8[0-9][0-9] | hp8[0-9][0-9])
+        basic_machine=hppa1.0-hp
+        ;;
+    hppa-next)
+        os=-nextstep3
+        ;;
+    hppaosf)
+        basic_machine=hppa1.1-hp
+        os=-osf
+        ;;
+    hppro)
+        basic_machine=hppa1.1-hp
+        os=-proelf
+        ;;
+    i370-ibm* | ibm*)
+        basic_machine=i370-ibm
+        ;;
+    i*86v32)
+        basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+        os=-sysv32
+        ;;
+    i*86v4*)
+        basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+        os=-sysv4
+        ;;
+    i*86v)
+        basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+        os=-sysv
+        ;;
+    i*86sol2)
+        basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+        os=-solaris2
+        ;;
+    i386mach)
+        basic_machine=i386-mach
+        os=-mach
+        ;;
+    i386-vsta | vsta)
+        basic_machine=i386-unknown
+        os=-vsta
+        ;;
+    iris | iris4d)
+        basic_machine=mips-sgi
+        case $os in
+            -irix*)
+            ;;
+            *)
+            os=-irix4
+            ;;
+        esac
+        ;;
+    isi68 | isi)
+        basic_machine=m68k-isi
+        os=-sysv
+        ;;
+    leon-*|leon[3-9]-*)
+        basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+        ;;
+    m68knommu)
+        basic_machine=m68k-unknown
+        os=-linux
+        ;;
+    m68knommu-*)
+        basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+        os=-linux
+        ;;
+    m88k-omron*)
+        basic_machine=m88k-omron
+        ;;
+    magnum | m3230)
+        basic_machine=mips-mips
+        os=-sysv
+        ;;
+    merlin)
+        basic_machine=ns32k-utek
+        os=-sysv
+        ;;
+    microblaze*)
+        basic_machine=microblaze-xilinx
+        ;;
+    mingw64)
+        basic_machine=x86_64-pc
+        os=-mingw64
+        ;;
+    mingw32)
+        basic_machine=i686-pc
+        os=-mingw32
+        ;;
+    mingw32ce)
+        basic_machine=arm-unknown
+        os=-mingw32ce
+        ;;
+    miniframe)
+        basic_machine=m68000-convergent
+        ;;
+    *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+        basic_machine=m68k-atari
+        os=-mint
+        ;;
+    mips3*-*)
+        basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+        ;;
+    mips3*)
+        basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+        ;;
+    monitor)
+        basic_machine=m68k-rom68k
+        os=-coff
+        ;;
+    morphos)
+        basic_machine=powerpc-unknown
+        os=-morphos
+        ;;
+    moxiebox)
+        basic_machine=moxie-unknown
+        os=-moxiebox
+        ;;
+    msdos)
+        basic_machine=i386-pc
+        os=-msdos
+        ;;
+    ms1-*)
+        basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+        ;;
+    msys)
+        basic_machine=i686-pc
+        os=-msys
+        ;;
+    mvs)
+        basic_machine=i370-ibm
+        os=-mvs
+        ;;
+    nacl)
+        basic_machine=le32-unknown
+        os=-nacl
+        ;;
+    ncr3000)
+        basic_machine=i486-ncr
+        os=-sysv4
+        ;;
+    netbsd386)
+        basic_machine=i386-unknown
+        os=-netbsd
+        ;;
+    netwinder)
+        basic_machine=armv4l-rebel
+        os=-linux
+        ;;
+    news | news700 | news800 | news900)
+        basic_machine=m68k-sony
+        os=-newsos
+        ;;
+    news1000)
+        basic_machine=m68030-sony
+        os=-newsos
+        ;;
+    news-3600 | risc-news)
+        basic_machine=mips-sony
+        os=-newsos
+        ;;
+    necv70)
+        basic_machine=v70-nec
+        os=-sysv
+        ;;
+    next | m*-next )
+        basic_machine=m68k-next
+        case $os in
+            -nextstep* )
+            ;;
+            -ns2*)
+              os=-nextstep2
+            ;;
+            *)
+              os=-nextstep3
+            ;;
+        esac
+        ;;
+    nh3000)
+        basic_machine=m68k-harris
+        os=-cxux
+        ;;
+    nh[45]000)
+        basic_machine=m88k-harris
+        os=-cxux
+        ;;
+    nindy960)
+        basic_machine=i960-intel
+        os=-nindy
+        ;;
+    mon960)
+        basic_machine=i960-intel
+        os=-mon960
+        ;;
+    nonstopux)
+        basic_machine=mips-compaq
+        os=-nonstopux
+        ;;
+    np1)
+        basic_machine=np1-gould
+        ;;
+    neo-tandem)
+        basic_machine=neo-tandem
+        ;;
+    nse-tandem)
+        basic_machine=nse-tandem
+        ;;
+    nsr-tandem)
+        basic_machine=nsr-tandem
+        ;;
+    nsx-tandem)
+        basic_machine=nsx-tandem
+        ;;
+    op50n-* | op60c-*)
+        basic_machine=hppa1.1-oki
+        os=-proelf
+        ;;
+    openrisc | openrisc-*)
+        basic_machine=or32-unknown
+        ;;
+    os400)
+        basic_machine=powerpc-ibm
+        os=-os400
+        ;;
+    OSE68000 | ose68000)
+        basic_machine=m68000-ericsson
+        os=-ose
+        ;;
+    os68k)
+        basic_machine=m68k-none
+        os=-os68k
+        ;;
+    pa-hitachi)
+        basic_machine=hppa1.1-hitachi
+        os=-hiuxwe2
+        ;;
+    paragon)
+        basic_machine=i860-intel
+        os=-osf
+        ;;
+    parisc)
+        basic_machine=hppa-unknown
+        os=-linux
+        ;;
+    parisc-*)
+        basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+        os=-linux
+        ;;
+    pbd)
+        basic_machine=sparc-tti
+        ;;
+    pbb)
+        basic_machine=m68k-tti
+        ;;
+    pc532 | pc532-*)
+        basic_machine=ns32k-pc532
+        ;;
+    pc98)
+        basic_machine=i386-pc
+        ;;
+    pc98-*)
+        basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    pentium | p5 | k5 | k6 | nexgen | viac3)
+        basic_machine=i586-pc
+        ;;
+    pentiumpro | p6 | 6x86 | athlon | athlon_*)
+        basic_machine=i686-pc
+        ;;
+    pentiumii | pentium2 | pentiumiii | pentium3)
+        basic_machine=i686-pc
+        ;;
+    pentium4)
+        basic_machine=i786-pc
+        ;;
+    pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+        basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    pentiumpro-* | p6-* | 6x86-* | athlon-*)
+        basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+        basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    pentium4-*)
+        basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    pn)
+        basic_machine=pn-gould
+        ;;
+    power)  basic_machine=power-ibm
+        ;;
+    ppc | ppcbe)    basic_machine=powerpc-unknown
+        ;;
+    ppc-* | ppcbe-*)
+        basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    ppcle | powerpclittle)
+        basic_machine=powerpcle-unknown
+        ;;
+    ppcle-* | powerpclittle-*)
+        basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    ppc64)  basic_machine=powerpc64-unknown
+        ;;
+    ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    ppc64le | powerpc64little)
+        basic_machine=powerpc64le-unknown
+        ;;
+    ppc64le-* | powerpc64little-*)
+        basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    ps2)
+        basic_machine=i386-ibm
+        ;;
+    pw32)
+        basic_machine=i586-unknown
+        os=-pw32
+        ;;
+    rdos | rdos64)
+        basic_machine=x86_64-pc
+        os=-rdos
+        ;;
+    rdos32)
+        basic_machine=i386-pc
+        os=-rdos
+        ;;
+    rom68k)
+        basic_machine=m68k-rom68k
+        os=-coff
+        ;;
+    rm[46]00)
+        basic_machine=mips-siemens
+        ;;
+    rtpc | rtpc-*)
+        basic_machine=romp-ibm
+        ;;
+    s390 | s390-*)
+        basic_machine=s390-ibm
+        ;;
+    s390x | s390x-*)
+        basic_machine=s390x-ibm
+        ;;
+    sa29200)
+        basic_machine=a29k-amd
+        os=-udi
+        ;;
+    sb1)
+        basic_machine=mipsisa64sb1-unknown
+        ;;
+    sb1el)
+        basic_machine=mipsisa64sb1el-unknown
+        ;;
+    sde)
+        basic_machine=mipsisa32-sde
+        os=-elf
+        ;;
+    sei)
+        basic_machine=mips-sei
+        os=-seiux
+        ;;
+    sequent)
+        basic_machine=i386-sequent
+        ;;
+    sh)
+        basic_machine=sh-hitachi
+        os=-hms
+        ;;
+    sh5el)
+        basic_machine=sh5le-unknown
+        ;;
+    sh64)
+        basic_machine=sh64-unknown
+        ;;
+    sparclite-wrs | simso-wrs)
+        basic_machine=sparclite-wrs
+        os=-vxworks
+        ;;
+    sps7)
+        basic_machine=m68k-bull
+        os=-sysv2
+        ;;
+    spur)
+        basic_machine=spur-unknown
+        ;;
+    st2000)
+        basic_machine=m68k-tandem
+        ;;
+    stratus)
+        basic_machine=i860-stratus
+        os=-sysv4
+        ;;
+    strongarm-* | thumb-*)
+        basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    sun2)
+        basic_machine=m68000-sun
+        ;;
+    sun2os3)
+        basic_machine=m68000-sun
+        os=-sunos3
+        ;;
+    sun2os4)
+        basic_machine=m68000-sun
+        os=-sunos4
+        ;;
+    sun3os3)
+        basic_machine=m68k-sun
+        os=-sunos3
+        ;;
+    sun3os4)
+        basic_machine=m68k-sun
+        os=-sunos4
+        ;;
+    sun4os3)
+        basic_machine=sparc-sun
+        os=-sunos3
+        ;;
+    sun4os4)
+        basic_machine=sparc-sun
+        os=-sunos4
+        ;;
+    sun4sol2)
+        basic_machine=sparc-sun
+        os=-solaris2
+        ;;
+    sun3 | sun3-*)
+        basic_machine=m68k-sun
+        ;;
+    sun4)
+        basic_machine=sparc-sun
+        ;;
+    sun386 | sun386i | roadrunner)
+        basic_machine=i386-sun
+        ;;
+    sv1)
+        basic_machine=sv1-cray
+        os=-unicos
+        ;;
+    symmetry)
+        basic_machine=i386-sequent
+        os=-dynix
+        ;;
+    t3e)
+        basic_machine=alphaev5-cray
+        os=-unicos
+        ;;
+    t90)
+        basic_machine=t90-cray
+        os=-unicos
+        ;;
+    tile*)
+        basic_machine=$basic_machine-unknown
+        os=-linux-gnu
+        ;;
+    tx39)
+        basic_machine=mipstx39-unknown
+        ;;
+    tx39el)
+        basic_machine=mipstx39el-unknown
+        ;;
+    toad1)
+        basic_machine=pdp10-xkl
+        os=-tops20
+        ;;
+    tower | tower-32)
+        basic_machine=m68k-ncr
+        ;;
+    tpf)
+        basic_machine=s390x-ibm
+        os=-tpf
+        ;;
+    udi29k)
+        basic_machine=a29k-amd
+        os=-udi
+        ;;
+    ultra3)
+        basic_machine=a29k-nyu
+        os=-sym1
+        ;;
+    v810 | necv810)
+        basic_machine=v810-nec
+        os=-none
+        ;;
+    vaxv)
+        basic_machine=vax-dec
+        os=-sysv
+        ;;
+    vms)
+        basic_machine=vax-dec
+        os=-vms
+        ;;
+    vpp*|vx|vx-*)
+        basic_machine=f301-fujitsu
+        ;;
+    vxworks960)
+        basic_machine=i960-wrs
+        os=-vxworks
+        ;;
+    vxworks68)
+        basic_machine=m68k-wrs
+        os=-vxworks
+        ;;
+    vxworks29k)
+        basic_machine=a29k-wrs
+        os=-vxworks
+        ;;
+    wasm32)
+        basic_machine=wasm32-unknown
+        ;;
+    w65*)
+        basic_machine=w65-wdc
+        os=-none
+        ;;
+    w89k-*)
+        basic_machine=hppa1.1-winbond
+        os=-proelf
+        ;;
+    xbox)
+        basic_machine=i686-pc
+        os=-mingw32
+        ;;
+    xps | xps100)
+        basic_machine=xps100-honeywell
+        ;;
+    xscale-* | xscalee[bl]-*)
+        basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+        ;;
+    ymp)
+        basic_machine=ymp-cray
+        os=-unicos
+        ;;
+    z8k-*-coff)
+        basic_machine=z8k-unknown
+        os=-sim
+        ;;
+    z80-*-coff)
+        basic_machine=z80-unknown
+        os=-sim
+        ;;
+    none)
+        basic_machine=none-none
+        os=-none
+        ;;
 
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
+    w89k)
+        basic_machine=hppa1.1-winbond
+        ;;
+    op50n)
+        basic_machine=hppa1.1-oki
+        ;;
+    op60c)
+        basic_machine=hppa1.1-oki
+        ;;
+    romp)
+        basic_machine=romp-ibm
+        ;;
+    mmix)
+        basic_machine=mmix-knuth
+        ;;
+    rs6000)
+        basic_machine=rs6000-ibm
+        ;;
+    vax)
+        basic_machine=vax-dec
+        ;;
+    pdp10)
+        # there are many clones, so DEC is not a safe bet
+        basic_machine=pdp10-unknown
+        ;;
+    pdp11)
+        basic_machine=pdp11-dec
+        ;;
+    we32k)
+        basic_machine=we32k-att
+        ;;
+    sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+        basic_machine=sh-unknown
+        ;;
+    sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+        basic_machine=sparc-sun
+        ;;
+    cydra)
+        basic_machine=cydra-cydrome
+        ;;
+    orion)
+        basic_machine=orion-highlevel
+        ;;
+    orion105)
+        basic_machine=clipper-highlevel
+        ;;
+    mac | mpw | mac-mpw)
+        basic_machine=m68k-apple
+        ;;
+    pmac | pmac-mpw)
+        basic_machine=powerpc-apple
+        ;;
+    *-unknown)
+        # Make sure to match an already-canonicalized machine name.
+        ;;
+    *)
+        echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+        exit 1
+        ;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
 case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
+    *-digital*)
+        basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+        ;;
+    *-commodore*)
+        basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+        ;;
+    *)
+        ;;
 esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
@@ -1326,196 +1366,199 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
+    # First match some system type aliases
+    # that might get confused with valid system types.
+    # -solaris* is a basic system type, with this one exception.
+    -auroraux)
+        os=-auroraux
+        ;;
+    -solaris1 | -solaris1.*)
+        os=`echo $os | sed -e 's|solaris1|sunos4|'`
+        ;;
+    -solaris)
+        os=-solaris2
+        ;;
+    -svr4*)
+        os=-sysv4
+        ;;
+    -unixware*)
+        os=-sysv4.2uw
+        ;;
+    -gnu/linux*)
+        os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+        ;;
+    # First accept the basic system types.
+    # The portable systems comes first.
+    # Each alternative MUST END IN A *, to match a version number.
+    # -sysv* is not here because it comes later, after sysvr4.
+    -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+          | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+          | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+          | -sym* | -kopensolaris* | -plan9* \
+          | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+          | -aos* | -aros* | -cloudabi* | -sortix* \
+          | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+          | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+          | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+          | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+          | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+          | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+          | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+          | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+          | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
+          | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+          | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+          | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+          | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+          | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+          | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+          | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+          | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+          | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+          | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+          | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+          | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
+    # Remember, each alternative MUST END IN *, to match a version number.
+        ;;
+    -qnx*)
+        case $basic_machine in
+            x86-* | i*86-*)
+            ;;
+            *)
+            os=-nto$os
+            ;;
+        esac
+        ;;
+    -nto-qnx*)
+        ;;
+    -nto*)
+        os=`echo $os | sed -e 's|nto|nto-qnx|'`
+        ;;
+    -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+          | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+          | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+        ;;
+    -mac*)
+        os=`echo $os | sed -e 's|mac|macos|'`
+        ;;
+    -linux-dietlibc)
+        os=-linux-dietlibc
+        ;;
+    -linux*)
+        os=`echo $os | sed -e 's|linux|linux-gnu|'`
+        ;;
+    -sunos5*)
+        os=`echo $os | sed -e 's|sunos5|solaris2|'`
+        ;;
+    -sunos6*)
+        os=`echo $os | sed -e 's|sunos6|solaris3|'`
+        ;;
+    -opened*)
+        os=-openedition
+        ;;
+    -os400*)
+        os=-os400
+        ;;
+    -wince*)
+        os=-wince
+        ;;
+    -osfrose*)
+        os=-osfrose
+        ;;
+    -osf*)
+        os=-osf
+        ;;
+    -utek*)
+        os=-bsd
+        ;;
+    -dynix*)
+        os=-bsd
+        ;;
+    -acis*)
+        os=-aos
+        ;;
+    -atheos*)
+        os=-atheos
+        ;;
+    -syllable*)
+        os=-syllable
+        ;;
+    -386bsd)
+        os=-bsd
+        ;;
+    -ctix* | -uts*)
+        os=-sysv
+        ;;
+    -nova*)
+        os=-rtmk-nova
+        ;;
+    -ns2 )
+        os=-nextstep2
+        ;;
+    -nsk*)
+        os=-nsk
+        ;;
+    # Preserve the version number of sinix5.
+    -sinix5.*)
+        os=`echo $os | sed -e 's|sinix|sysv|'`
+        ;;
+    -sinix*)
+        os=-sysv4
+        ;;
+    -tpf*)
+        os=-tpf
+        ;;
+    -triton*)
+        os=-sysv3
+        ;;
+    -oss*)
+        os=-sysv3
+        ;;
+    -svr4)
+        os=-sysv4
+        ;;
+    -svr3)
+        os=-sysv3
+        ;;
+    -sysvr4)
+        os=-sysv4
+        ;;
+    # This must come after -sysvr4.
+    -sysv*)
+        ;;
+    -ose*)
+        os=-ose
+        ;;
+    -es1800*)
+        os=-ose
+        ;;
+    -xenix)
+        os=-xenix
+        ;;
+    -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+        os=-mint
+        ;;
+    -aros*)
+        os=-aros
+        ;;
+    -zvmoe)
+        os=-zvmoe
+        ;;
+    -dicos*)
+        os=-dicos
+        ;;
+    -nacl*)
+        ;;
+    -ios)
+        ;;
+    -none)
+        ;;
+    *)
+        # Get rid of the `-' at the beginning of $os.
+        os=`echo $os | sed 's/[^-]*-//'`
+        echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+        exit 1
+        ;;
 esac
 else
 
@@ -1530,181 +1573,181 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	c8051-*)
-		os=-elf
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or1k-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
+    score-*)
+        os=-elf
+        ;;
+    spu-*)
+        os=-elf
+        ;;
+    *-acorn)
+        os=-riscix1.2
+        ;;
+    arm*-rebel)
+        os=-linux
+        ;;
+    arm*-semi)
+        os=-aout
+        ;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
+    c8051-*)
+        os=-elf
+        ;;
+    hexagon-*)
+        os=-elf
+        ;;
+    tic54x-*)
+        os=-coff
+        ;;
+    tic55x-*)
+        os=-coff
+        ;;
+    tic6x-*)
+        os=-coff
+        ;;
+    # This must come before the *-dec entry.
+    pdp10-*)
+        os=-tops20
+        ;;
+    pdp11-*)
+        os=-none
+        ;;
+    *-dec | vax-*)
+        os=-ultrix4.2
+        ;;
+    m68*-apollo)
+        os=-domain
+        ;;
+    i386-sun)
+        os=-sunos4.0.2
+        ;;
+    m68000-sun)
+        os=-sunos3
+        ;;
+    m68*-cisco)
+        os=-aout
+        ;;
+    mep-*)
+        os=-elf
+        ;;
+    mips*-cisco)
+        os=-elf
+        ;;
+    mips*-*)
+        os=-elf
+        ;;
+    or32-*)
+        os=-coff
+        ;;
+    *-tti)  # must be before sparc entry or we get the wrong os.
+        os=-sysv3
+        ;;
+    sparc-* | *-sun)
+        os=-sunos4.1.1
+        ;;
+    pru-*)
+        os=-elf
+        ;;
+    *-be)
+        os=-beos
+        ;;
+    *-haiku)
+        os=-haiku
+        ;;
+    *-ibm)
+        os=-aix
+        ;;
+    *-knuth)
+        os=-mmixware
+        ;;
+    *-wec)
+        os=-proelf
+        ;;
+    *-winbond)
+        os=-proelf
+        ;;
+    *-oki)
+        os=-proelf
+        ;;
+    *-hp)
+        os=-hpux
+        ;;
+    *-hitachi)
+        os=-hiux
+        ;;
+    i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+        os=-sysv
+        ;;
+    *-cbm)
+        os=-amigaos
+        ;;
+    *-dg)
+        os=-dgux
+        ;;
+    *-dolphin)
+        os=-sysv3
+        ;;
+    m68k-ccur)
+        os=-rtu
+        ;;
+    m88k-omron*)
+        os=-luna
+        ;;
+    *-next )
+        os=-nextstep
+        ;;
+    *-sequent)
+        os=-ptx
+        ;;
+    *-crds)
+        os=-unos
+        ;;
+    *-ns)
+        os=-genix
+        ;;
+    i370-*)
+        os=-mvs
+        ;;
+    *-next)
+        os=-nextstep3
+        ;;
+    *-gould)
+        os=-sysv
+        ;;
+    *-highlevel)
+        os=-bsd
+        ;;
+    *-encore)
+        os=-bsd
+        ;;
+    *-sgi)
+        os=-irix
+        ;;
+    *-siemens)
+        os=-sysv4
+        ;;
+    *-masscomp)
+        os=-rtu
+        ;;
+    f30[01]-fujitsu | f700-fujitsu)
+        os=-uxpv
+        ;;
+    *-rom68k)
+        os=-coff
+        ;;
+    *-*bug)
+        os=-coff
+        ;;
+    *-apple)
+        os=-macos
+        ;;
+    *-atari*)
+        os=-mint
+        ;;
+    *)
+        os=-none
+        ;;
 esac
 fi
 
@@ -1712,74 +1755,74 @@ fi
 # manufacturer.  We pick the logical manufacturer.
 vendor=unknown
 case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
+    *-unknown)
+        case $os in
+            -riscix*)
+                vendor=acorn
+                ;;
+            -sunos*)
+                vendor=sun
+                ;;
+            -cnk*|-aix*)
+                vendor=ibm
+                ;;
+            -beos*)
+                vendor=be
+                ;;
+            -hpux*)
+                vendor=hp
+                ;;
+            -mpeix*)
+                vendor=hp
+                ;;
+            -hiux*)
+                vendor=hitachi
+                ;;
+            -unos*)
+                vendor=crds
+                ;;
+            -dgux*)
+                vendor=dg
+                ;;
+            -luna*)
+                vendor=omron
+                ;;
+            -genix*)
+                vendor=ns
+                ;;
+            -mvs* | -opened*)
+                vendor=ibm
+                ;;
+            -os400*)
+                vendor=ibm
+                ;;
+            -ptx*)
+                vendor=sequent
+                ;;
+            -tpf*)
+                vendor=ibm
+                ;;
+            -vxsim* | -vxworks* | -windiss*)
+                vendor=wrs
+                ;;
+            -aux*)
+                vendor=apple
+                ;;
+            -hms*)
+                vendor=hitachi
+                ;;
+            -mpw* | -macos*)
+                vendor=apple
+                ;;
+            -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                vendor=atari
+                ;;
+            -vos*)
+                vendor=stratus
+                ;;
+        esac
+        basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+        ;;
 esac
 
 echo $basic_machine$os