You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2019/05/03 11:27:35 UTC

[commons-daemon] branch master updated (78db193 -> b38e313)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git.


    from 78db193  Fix DAEMON-385. Update config.guess and config.sub.
     new 25d0053  Undo automatic tab->spaces changes that broke the scripts
     new b38e313  Ignore generated files

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/native/unix/.gitignore           |    7 +
 src/native/unix/native/.gitignore    |    1 +
 src/native/unix/support/config.guess | 2174 +++++++++++------------
 src/native/unix/support/config.sub   | 3240 +++++++++++++++++-----------------
 4 files changed, 2715 insertions(+), 2707 deletions(-)
 create mode 100644 src/native/unix/.gitignore
 create mode 100644 src/native/unix/native/.gitignore
 mode change 100644 => 100755 src/native/unix/support/config.guess


[commons-daemon] 01/02: Undo automatic tab->spaces changes that broke the scripts

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git

commit 25d0053d5e51e6f50a7a6d5316b2243a5cdfb26c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 3 12:19:09 2019 +0100

    Undo automatic tab->spaces changes that broke the scripts
---
 src/native/unix/support/config.guess | 2174 +++++++++++------------
 src/native/unix/support/config.sub   | 3240 +++++++++++++++++-----------------
 2 files changed, 2707 insertions(+), 2707 deletions(-)

diff --git a/src/native/unix/support/config.guess b/src/native/unix/support/config.guess
old mode 100644
new mode 100755
index f994ddc..6b31c7f
--- a/src/native/unix/support/config.guess
+++ b/src/native/unix/support/config.guess
@@ -69,7 +69,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" >&2
@@ -102,31 +102,31 @@ set_cc_for_build() {
     : "${TMPDIR=/tmp}"
     # shellcheck disable=SC2039
     { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-        { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
-        { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-        { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
     dummy=$tmp/dummy
     case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
-        ,,)    echo "int x;" > "$dummy.c"
-               for driver in cc gcc c89 c99 ; do
-                   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-                       CC_FOR_BUILD="$driver"
-                       break
-                   fi
-               done
-               if test x"$CC_FOR_BUILD" = x ; then
-                   CC_FOR_BUILD=no_compiler_found
-               fi
-               ;;
-        ,,*)   CC_FOR_BUILD=$CC ;;
-        ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD="$driver"
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
     esac
 }
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
 if test -f /.attbin/uname ; then
-        PATH=$PATH:/.attbin ; export PATH
+	PATH=$PATH:/.attbin ; export PATH
 fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
@@ -136,309 +136,309 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "$UNAME_SYSTEM" in
 Linux|GNU|GNU/*)
-        # If the system lacks a compiler, then just pick glibc.
-        # We could probably try harder.
-        LIBC=gnu
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
 
-        set_cc_for_build
-        cat <<-EOF > "$dummy.c"
-        #include <features.h>
-        #if defined(__UCLIBC__)
-        LIBC=uclibc
-        #elif defined(__dietlibc__)
-        LIBC=dietlibc
-        #else
-        LIBC=gnu
-        #endif
-        EOF
-        eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+	set_cc_for_build
+	cat <<-EOF > "$dummy.c"
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
 
-        # If ldd exists, use it to detect musl libc.
-        if command -v ldd >/dev/null && \
-                ldd --version 2>&1 | grep -q ^musl
-        then
-            LIBC=musl
-        fi
-        ;;
+	# If ldd exists, use it to detect musl libc.
+	if command -v ldd >/dev/null && \
+		ldd --version 2>&1 | grep -q ^musl
+	then
+	    LIBC=musl
+	fi
+	;;
 esac
 
 # Note: order is significant - the case branches are not exclusive.
 
 case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
     *:NetBSD:*:*)
-        # NetBSD (nbsd) targets should (where applicable) match one or
-        # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-        # switched to ELF, *-*-netbsd* would select the old
-        # object file format.  This provides both forward
-        # compatibility and a consistent mechanism for selecting the
-        # object file format.
-        #
-        # 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=`(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) and ABI.
-        case "$UNAME_MACHINE_ARCH" in
-            earm*)
-                os=netbsdelf
-                ;;
-            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-                set_cc_for_build
-                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-                        | grep -q __ELF__
-                then
-                    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-                    # Return netbsd for either.  FIX?
-                    os=netbsd
-                else
-                    os=netbsdelf
-                fi
-                ;;
-            *)
-                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
-        # kernel version information, so it can be replaced with a
-        # suitable tag, in the style of linux-gnu.
-        case "$UNAME_VERSION" in
-            Debian*)
-                release='-gnu'
-                ;;
-            *)
-                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}${abi-}"
-        exit ;;
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# 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=`(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) and ABI.
+	case "$UNAME_MACHINE_ARCH" in
+	    earm*)
+		os=netbsdelf
+		;;
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		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
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "$UNAME_VERSION" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		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}${abi-}"
+	exit ;;
     *:Bitrig:*:*)
-        UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-        echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
-        exit ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
+	exit ;;
     *:OpenBSD:*:*)
-        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-        echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
-        exit ;;
+	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 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+	exit ;;
     *:MidnightBSD:*:*)
-        echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+	exit ;;
     *:ekkoBSD:*:*)
-        echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+	exit ;;
     *:SolidBSD:*:*)
-        echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+	exit ;;
     macppc:MirBSD:*:*)
-        echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
-        exit ;;
+	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+	exit ;;
     *:MirBSD:*:*)
-        echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+	exit ;;
     *:Sortix:*:*)
-        echo "$UNAME_MACHINE"-unknown-sortix
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-sortix
+	exit ;;
     *:Redox:*:*)
-        echo "$UNAME_MACHINE"-unknown-redox
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-redox
+	exit ;;
     mips:OSF1:*.*)
         echo mips-dec-osf1
         exit ;;
     alpha:OSF1:*:*)
-        case $UNAME_RELEASE in
-        *4.0)
-                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-                ;;
-        *5.*)
-                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-                ;;
-        esac
-        # According to Compaq, /usr/sbin/psrinfo has been available on
-        # OSF/1 and Tru64 systems produced since 1995.  I hope that
-        # covers most systems running today.  This code pipes the CPU
-        # types through head -n 1, so we only detect the type of CPU 0.
-        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 ;;
-            "EV4.5 (21064)")
-                UNAME_MACHINE=alpha ;;
-            "LCA4 (21066/21068)")
-                UNAME_MACHINE=alpha ;;
-            "EV5 (21164)")
-                UNAME_MACHINE=alphaev5 ;;
-            "EV5.6 (21164A)")
-                UNAME_MACHINE=alphaev56 ;;
-            "EV5.6 (21164PC)")
-                UNAME_MACHINE=alphapca56 ;;
-            "EV5.7 (21164PC)")
-                UNAME_MACHINE=alphapca57 ;;
-            "EV6 (21264)")
-                UNAME_MACHINE=alphaev6 ;;
-            "EV6.7 (21264A)")
-                UNAME_MACHINE=alphaev67 ;;
-            "EV6.8CB (21264C)")
-                UNAME_MACHINE=alphaev68 ;;
-            "EV6.8AL (21264B)")
-                UNAME_MACHINE=alphaev68 ;;
-            "EV6.8CX (21264D)")
-                UNAME_MACHINE=alphaev68 ;;
-            "EV6.9A (21264/EV69A)")
-                UNAME_MACHINE=alphaev69 ;;
-            "EV7 (21364)")
-                UNAME_MACHINE=alphaev7 ;;
-            "EV7.9 (21364A)")
-                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`"
-        # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-        exitcode=$?
-        trap '' 0
-        exit $exitcode ;;
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	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 ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE=alpha ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE=alpha ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE=alphaev5 ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE=alphaev56 ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE=alphapca56 ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE=alphapca57 ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE=alphaev6 ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE=alphaev67 ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE=alphaev69 ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE=alphaev7 ;;
+	    "EV7.9 (21364A)")
+		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`"
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Amiga*:UNIX_System_V:4.0:*)
-        echo m68k-unknown-sysv4
-        exit ;;
+	echo m68k-unknown-sysv4
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
-        echo "$UNAME_MACHINE"-unknown-amigaos
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-amigaos
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
-        echo "$UNAME_MACHINE"-unknown-morphos
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-morphos
+	exit ;;
     *:OS/390:*:*)
-        echo i370-ibm-openedition
-        exit ;;
+	echo i370-ibm-openedition
+	exit ;;
     *:z/VM:*:*)
-        echo s390-ibm-zvmoe
-        exit ;;
+	echo s390-ibm-zvmoe
+	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
-        exit ;;
+	echo powerpc-ibm-os400
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-        echo arm-acorn-riscix"$UNAME_RELEASE"
-        exit ;;
+	echo arm-acorn-riscix"$UNAME_RELEASE"
+	exit ;;
     arm*:riscos:*:*|arm*:RISCOS:*:*)
-        echo arm-unknown-riscos
-        exit ;;
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-        echo hppa1.1-hitachi-hiuxmpp
-        exit ;;
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-        # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-        if test "`(/bin/universe) 2>/dev/null`" = att ; then
-                echo pyramid-pyramid-sysv3
-        else
-                echo pyramid-pyramid-bsd
-        fi
-        exit ;;
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
     NILE*:*:*:dcosx)
-        echo pyramid-pyramid-svr4
-        exit ;;
+	echo pyramid-pyramid-svr4
+	exit ;;
     DRS?6000:unix:4.0:6*)
-        echo sparc-icl-nx6
-        exit ;;
+	echo sparc-icl-nx6
+	exit ;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-        case `/usr/bin/uname -p` in
-            sparc) echo sparc-icl-nx7; exit ;;
-        esac ;;
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
     s390x:SunOS:*:*)
-        echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
-        exit ;;
+	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+	exit ;;
     sun4H:SunOS:5.*:*)
-        echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-        exit ;;
+	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-        echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
-        exit ;;
+	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+	exit ;;
     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-        echo i386-pc-auroraux"$UNAME_RELEASE"
-        exit ;;
+	echo i386-pc-auroraux"$UNAME_RELEASE"
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-        set_cc_for_build
-        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 (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-                (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-                grep IS_64BIT_ARCH >/dev/null
-            then
-                SUN_ARCH=x86_64
-            fi
-        fi
-        echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-        exit ;;
+	set_cc_for_build
+	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 (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH=x86_64
+	    fi
+	fi
+	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	exit ;;
     sun4*:SunOS:6*:*)
-        # According to config.sub, this is the proper way to canonicalize
-        # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-        # it's likely to be more like Solaris than SunOS4.
-        echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-        exit ;;
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	exit ;;
     sun4*:SunOS:*:*)
-        case "`/usr/bin/arch -k`" in
-            Series*|S4*)
-                UNAME_RELEASE=`uname -v`
-                ;;
-        esac
-        # Japanese Language versions have a version number like `4.1.3-JL'.
-        echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
-        exit ;;
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
+	exit ;;
     sun3*:SunOS:*:*)
-        echo m68k-sun-sunos"$UNAME_RELEASE"
-        exit ;;
+	echo m68k-sun-sunos"$UNAME_RELEASE"
+	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
-        case "`/bin/arch`" in
-            sun3)
-                echo m68k-sun-sunos"$UNAME_RELEASE"
-                ;;
-            sun4)
-                echo sparc-sun-sunos"$UNAME_RELEASE"
-                ;;
-        esac
-        exit ;;
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos"$UNAME_RELEASE"
+		;;
+	    sun4)
+		echo sparc-sun-sunos"$UNAME_RELEASE"
+		;;
+	esac
+	exit ;;
     aushp:SunOS:*:*)
-        echo sparc-auspex-sunos"$UNAME_RELEASE"
-        exit ;;
+	echo sparc-auspex-sunos"$UNAME_RELEASE"
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -448,1017 +448,1017 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint"$UNAME_RELEASE"
-        exit ;;
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint"$UNAME_RELEASE"
-        exit ;;
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint"$UNAME_RELEASE"
-        exit ;;
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint"$UNAME_RELEASE"
-        exit ;;
+	echo m68k-milan-mint"$UNAME_RELEASE"
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint"$UNAME_RELEASE"
-        exit ;;
+	echo m68k-hades-mint"$UNAME_RELEASE"
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint"$UNAME_RELEASE"
-        exit ;;
+	echo m68k-unknown-mint"$UNAME_RELEASE"
+	exit ;;
     m68k:machten:*:*)
-        echo m68k-apple-machten"$UNAME_RELEASE"
-        exit ;;
+	echo m68k-apple-machten"$UNAME_RELEASE"
+	exit ;;
     powerpc:machten:*:*)
-        echo powerpc-apple-machten"$UNAME_RELEASE"
-        exit ;;
+	echo powerpc-apple-machten"$UNAME_RELEASE"
+	exit ;;
     RISC*:Mach:*:*)
-        echo mips-dec-mach_bsd4.3
-        exit ;;
+	echo mips-dec-mach_bsd4.3
+	exit ;;
     RISC*:ULTRIX:*:*)
-        echo mips-dec-ultrix"$UNAME_RELEASE"
-        exit ;;
+	echo mips-dec-ultrix"$UNAME_RELEASE"
+	exit ;;
     VAX*:ULTRIX*:*:*)
-        echo vax-dec-ultrix"$UNAME_RELEASE"
-        exit ;;
+	echo vax-dec-ultrix"$UNAME_RELEASE"
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
-        echo clipper-intergraph-clix"$UNAME_RELEASE"
-        exit ;;
+	echo clipper-intergraph-clix"$UNAME_RELEASE"
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-        set_cc_for_build
-        sed 's/^        //' << EOF > "$dummy.c"
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
-        int main (int argc, char *argv[]) {
+	int main (int argc, char *argv[]) {
 #else
-        int main (argc, argv) int argc; char *argv[]; {
+	int main (argc, argv) int argc; char *argv[]; {
 #endif
-        #if defined (host_mips) && defined (MIPSEB)
-        #if defined (SYSTYPE_SYSV)
-          printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
-        #endif
-        #if defined (SYSTYPE_SVR4)
-          printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
-        #endif
-        #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-          printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
-        #endif
-        #endif
-          exit (-1);
-        }
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
 EOF
-        $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
-          dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-          SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
-            { echo "$SYSTEM_NAME"; exit; }
-        echo mips-mips-riscos"$UNAME_RELEASE"
-        exit ;;
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos"$UNAME_RELEASE"
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
-        echo powerpc-motorola-powermax
-        exit ;;
+	echo powerpc-motorola-powermax
+	exit ;;
     Motorola:*:4.3:PL8-*)
-        echo powerpc-harris-powermax
-        exit ;;
+	echo powerpc-harris-powermax
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-        echo powerpc-harris-powermax
-        exit ;;
+	echo powerpc-harris-powermax
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
-        echo powerpc-harris-powerunix
-        exit ;;
+	echo powerpc-harris-powerunix
+	exit ;;
     m88k:CX/UX:7*:*)
-        echo m88k-harris-cxux7
-        exit ;;
+	echo m88k-harris-cxux7
+	exit ;;
     m88k:*:4*:R4*)
-        echo m88k-motorola-sysv4
-        exit ;;
+	echo m88k-motorola-sysv4
+	exit ;;
     m88k:*:3*:R3*)
-        echo m88k-motorola-sysv3
-        exit ;;
+	echo m88k-motorola-sysv3
+	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
-        then
-            if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
-               [ "$TARGET_BINARY_INTERFACE"x = x ]
-            then
-                echo m88k-dg-dgux"$UNAME_RELEASE"
-            else
-                echo m88k-dg-dguxbcs"$UNAME_RELEASE"
-            fi
-        else
-            echo i586-dg-dgux"$UNAME_RELEASE"
-        fi
-        exit ;;
-    M88*:DolphinOS:*:*)        # DolphinOS (SVR3)
-        echo m88k-dolphin-sysv3
-        exit ;;
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+	then
+	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+	       [ "$TARGET_BINARY_INTERFACE"x = x ]
+	    then
+		echo m88k-dg-dgux"$UNAME_RELEASE"
+	    else
+		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+	    fi
+	else
+	    echo i586-dg-dgux"$UNAME_RELEASE"
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
     M88*:*:R3*:*)
-        # Delta 88k system running SVR3
-        echo m88k-motorola-sysv3
-        exit ;;
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-        echo m88k-tektronix-sysv3
-        exit ;;
+	echo m88k-tektronix-sysv3
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-        echo m68k-tektronix-bsd
-        exit ;;
+	echo m68k-tektronix-bsd
+	exit ;;
     *:IRIX*:*:*)
-        echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
-        exit ;;
+	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-        echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-        exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
-        echo i386-ibm-aix
-        exit ;;
+	echo i386-ibm-aix
+	exit ;;
     ia64:AIX:*:*)
-        if [ -x /usr/bin/oslevel ] ; then
-                IBM_REV=`/usr/bin/oslevel`
-        else
-                IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
-        fi
-        echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
-        exit ;;
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+	fi
+	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
+	exit ;;
     *:AIX:2:3)
-        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-                set_cc_for_build
-                sed 's/^                //' << EOF > "$dummy.c"
-                #include <sys/systemcfg.h>
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		set_cc_for_build
+		sed 's/^		//' << EOF > "$dummy.c"
+		#include <sys/systemcfg.h>
 
-                main()
-                        {
-                        if (!__power_pc())
-                                exit(1);
-                        puts("powerpc-ibm-aix3.2.5");
-                        exit(0);
-                        }
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
 EOF
-                if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
-                then
-                        echo "$SYSTEM_NAME"
-                else
-                        echo rs6000-ibm-aix3.2.5
-                fi
-        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-                echo rs6000-ibm-aix3.2.4
-        else
-                echo rs6000-ibm-aix3.2
-        fi
-        exit ;;
+		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
     *:AIX:*:[4567])
-        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-        if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
-                IBM_ARCH=rs6000
-        else
-                IBM_ARCH=powerpc
-        fi
-        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
-        echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
-        exit ;;
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	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
+	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
+	exit ;;
     *:AIX:*:*)
-        echo rs6000-ibm-aix
-        exit ;;
+	echo rs6000-ibm-aix
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
-        echo romp-ibm-bsd4.4
-        exit ;;
+	echo romp-ibm-bsd4.4
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-        echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
-        exit ;;                             # report: romp-ibm BSD 4.3
+	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
-        echo rs6000-bull-bosx
-        exit ;;
+	echo rs6000-bull-bosx
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
-        echo m68k-bull-sysv3
-        exit ;;
+	echo m68k-bull-sysv3
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
-        echo m68k-hp-bsd
-        exit ;;
+	echo m68k-hp-bsd
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-        echo m68k-hp-bsd4.4
-        exit ;;
+	echo m68k-hp-bsd4.4
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
-        HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-        case "$UNAME_MACHINE" in
-            9000/31?)            HP_ARCH=m68000 ;;
-            9000/[34]??)         HP_ARCH=m68k ;;
-            9000/[678][0-9][0-9])
-                if [ -x /usr/bin/getconf ]; then
-                    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
-                      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
-                        esac ;;
-                    esac
-                fi
-                if [ "$HP_ARCH" = "" ]; then
-                    set_cc_for_build
-                    sed 's/^                //' << EOF > "$dummy.c"
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+	case "$UNAME_MACHINE" in
+	    9000/31?)            HP_ARCH=m68000 ;;
+	    9000/[34]??)         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    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
+		      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
+			esac ;;
+		    esac
+		fi
+		if [ "$HP_ARCH" = "" ]; then
+		    set_cc_for_build
+		    sed 's/^		//' << EOF > "$dummy.c"
 
-                #define _HPUX_SOURCE
-                #include <stdlib.h>
-                #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-                int main ()
-                {
-                #if defined(_SC_KERNEL_BITS)
-                    long bits = sysconf(_SC_KERNEL_BITS);
-                #endif
-                    long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                    switch (cpu)
-                        {
-                        case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-                        case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-                        case CPU_PA_RISC2_0:
-                #if defined(_SC_KERNEL_BITS)
-                            switch (bits)
-                                {
-                                case 64: puts ("hppa2.0w"); break;
-                                case 32: puts ("hppa2.0n"); break;
-                                default: puts ("hppa2.0"); break;
-                                } break;
-                #else  /* !defined(_SC_KERNEL_BITS) */
-                            puts ("hppa2.0"); break;
-                #endif
-                        default: puts ("hppa1.0"); break;
-                        }
-                    exit (0);
-                }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
-                    (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 ]
-        then
-            set_cc_for_build
+		    (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 ]
+	then
+	    set_cc_for_build
 
-            # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-            # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-            # generating 64-bit code.  GNU and HP use different nomenclature:
-            #
-            # $ CC_FOR_BUILD=cc ./config.guess
-            # => hppa2.0w-hp-hpux11.23
-            # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-            # => hppa64-hp-hpux11.23
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
 
-            if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
-                grep -q __LP64__
-            then
-                HP_ARCH=hppa2.0w
-            else
-                HP_ARCH=hppa64
-            fi
-        fi
-        echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
-        exit ;;
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH=hppa2.0w
+	    else
+		HP_ARCH=hppa64
+	    fi
+	fi
+	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+	exit ;;
     ia64:HP-UX:*:*)
-        HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-        echo ia64-hp-hpux"$HPUX_REV"
-        exit ;;
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux"$HPUX_REV"
+	exit ;;
     3050*:HI-UX:*:*)
-        set_cc_for_build
-        sed 's/^        //' << EOF > "$dummy.c"
-        #include <unistd.h>
-        int
-        main ()
-        {
-          long cpu = sysconf (_SC_CPU_VERSION);
-          /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-             true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-             results, however.  */
-          if (CPU_IS_PA_RISC (cpu))
-            {
-              switch (cpu)
-                {
-                  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-                  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-                  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-                  default: puts ("hppa-hitachi-hiuxwe2"); break;
-                }
-            }
-          else if (CPU_IS_HP_MC68K (cpu))
-            puts ("m68k-hitachi-hiuxwe2");
-          else puts ("unknown-hitachi-hiuxwe2");
-          exit (0);
-        }
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
 EOF
-        $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
-                { echo "$SYSTEM_NAME"; exit; }
-        echo unknown-hitachi-hiuxwe2
-        exit ;;
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
-        echo hppa1.1-hp-bsd
-        exit ;;
+	echo hppa1.1-hp-bsd
+	exit ;;
     9000/8??:4.3bsd:*:*)
-        echo hppa1.0-hp-bsd
-        exit ;;
+	echo hppa1.0-hp-bsd
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-        echo hppa1.0-hp-mpeix
-        exit ;;
+	echo hppa1.0-hp-mpeix
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
-        echo hppa1.1-hp-osf
-        exit ;;
+	echo hppa1.1-hp-osf
+	exit ;;
     hp8??:OSF1:*:*)
-        echo hppa1.0-hp-osf
-        exit ;;
+	echo hppa1.0-hp-osf
+	exit ;;
     i*86:OSF1:*:*)
-        if [ -x /usr/sbin/sysversion ] ; then
-            echo "$UNAME_MACHINE"-unknown-osf1mk
-        else
-            echo "$UNAME_MACHINE"-unknown-osf1
-        fi
-        exit ;;
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo "$UNAME_MACHINE"-unknown-osf1mk
+	else
+	    echo "$UNAME_MACHINE"-unknown-osf1
+	fi
+	exit ;;
     parisc*:Lites*:*:*)
-        echo hppa1.1-hp-lites
-        exit ;;
+	echo hppa1.1-hp-lites
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-        echo c1-convex-bsd
-        exit ;;
+	echo c1-convex-bsd
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-        if getsysinfo -f scalar_acc
-        then echo c32-convex-bsd
-        else echo c2-convex-bsd
-        fi
-        exit ;;
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-        echo c34-convex-bsd
-        exit ;;
+	echo c34-convex-bsd
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-        echo c38-convex-bsd
-        exit ;;
+	echo c38-convex-bsd
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-        echo c4-convex-bsd
-        exit ;;
+	echo c4-convex-bsd
+	exit ;;
     CRAY*Y-MP:*:*:*)
-        echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
-        echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
-        | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-              -e 's/\.[^.]*$/.X/'
-        exit ;;
+	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
     CRAY*TS:*:*:*)
-        echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     CRAY*T3E:*:*:*)
-        echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     CRAY*SV1:*:*:*)
-        echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     *:UNICOS/mp:*:*)
-        echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+	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_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	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/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	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:*:*)
-        echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+	exit ;;
     sparc*:BSD/OS:*:*)
-        echo sparc-unknown-bsdi"$UNAME_RELEASE"
-        exit ;;
+	echo sparc-unknown-bsdi"$UNAME_RELEASE"
+	exit ;;
     *:BSD/OS:*:*)
-        echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+	exit ;;
     arm:FreeBSD:*:*)
-        UNAME_PROCESSOR=`uname -p`
-        set_cc_for_build
-        if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-            | grep -q __ARM_PCS_VFP
-        then
-            echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
-        else
-            echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
-        fi
-        exit ;;
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
+	else
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
+	fi
+	exit ;;
     *:FreeBSD:*:*)
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-        case "$UNAME_PROCESSOR" in
-            amd64)
-                UNAME_PROCESSOR=x86_64 ;;
-            i386)
-                UNAME_PROCESSOR=i586 ;;
-        esac
-        echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-        exit ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case "$UNAME_PROCESSOR" in
+	    amd64)
+		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
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-cygwin
+	exit ;;
     *:MINGW64*:*)
-        echo "$UNAME_MACHINE"-pc-mingw64
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-mingw64
+	exit ;;
     *:MINGW*:*)
-        echo "$UNAME_MACHINE"-pc-mingw32
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-mingw32
+	exit ;;
     *:MSYS*:*)
-        echo "$UNAME_MACHINE"-pc-msys
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-msys
+	exit ;;
     i*:PW*:*)
-        echo "$UNAME_MACHINE"-pc-pw32
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-pw32
+	exit ;;
     *:Interix*:*)
-        case "$UNAME_MACHINE" in
-            x86)
-                echo i586-pc-interix"$UNAME_RELEASE"
-                exit ;;
-            authenticamd | genuineintel | EM64T)
-                echo x86_64-unknown-interix"$UNAME_RELEASE"
-                exit ;;
-            IA64)
-                echo ia64-unknown-interix"$UNAME_RELEASE"
-                exit ;;
-        esac ;;
+	case "$UNAME_MACHINE" in
+	    x86)
+		echo i586-pc-interix"$UNAME_RELEASE"
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix"$UNAME_RELEASE"
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix"$UNAME_RELEASE"
+		exit ;;
+	esac ;;
     i*:UWIN*:*)
-        echo "$UNAME_MACHINE"-pc-uwin
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-uwin
+	exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-        echo x86_64-pc-cygwin
-        exit ;;
+	echo x86_64-pc-cygwin
+	exit ;;
     prep*:SunOS:5.*:*)
-        echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-        exit ;;
+	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	exit ;;
     *:GNU:*:*)
-        # the GNU system
-        echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
-        exit ;;
+	# the GNU system
+	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
+	exit ;;
     *:GNU/*:*:*)
-        # other systems with GNU libc and userland
-        echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
-        exit ;;
+	# other systems with GNU libc and userland
+	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
+	exit ;;
     *:Minix:*:*)
-        echo "$UNAME_MACHINE"-unknown-minix
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-minix
+	exit ;;
     aarch64:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     aarch64_be:Linux:*:*)
-        UNAME_MACHINE=aarch64_be
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	UNAME_MACHINE=aarch64_be
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     alpha:Linux:*:*)
-        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-          EV5)   UNAME_MACHINE=alphaev5 ;;
-          EV56)  UNAME_MACHINE=alphaev56 ;;
-          PCA56) UNAME_MACHINE=alphapca56 ;;
-          PCA57) UNAME_MACHINE=alphapca56 ;;
-          EV6)   UNAME_MACHINE=alphaev6 ;;
-          EV67)  UNAME_MACHINE=alphaev67 ;;
-          EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-        objdump --private-headers /bin/sh | grep -q ld.so.1
-        if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     arm*:Linux:*:*)
-        set_cc_for_build
-        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-            | grep -q __ARM_EABI__
-        then
-            echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        else
-            if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-                | grep -q __ARM_PCS_VFP
-            then
-                echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
-            else
-                echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
-            fi
-        fi
-        exit ;;
+	set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+	    else
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+	    fi
+	fi
+	exit ;;
     avr32*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     cris:Linux:*:*)
-        echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+	exit ;;
     crisv32:Linux:*:*)
-        echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+	exit ;;
     e2k:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     frv:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     hexagon:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     i*86:Linux:*:*)
-        echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	exit ;;
     ia64:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     k1om:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     m32r*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     m68*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
-        set_cc_for_build
-        IS_GLIBC=0
-        test x"${LIBC}" = xgnu && IS_GLIBC=1
-        sed 's/^        //' << EOF > "$dummy.c"
-        #undef CPU
-        #undef mips
-        #undef mipsel
-        #undef mips64
-        #undef mips64el
-        #if ${IS_GLIBC} && defined(_ABI64)
-        LIBCABI=gnuabi64
-        #else
-        #if ${IS_GLIBC} && defined(_ABIN32)
-        LIBCABI=gnuabin32
-        #else
-        LIBCABI=${LIBC}
-        #endif
-        #endif
+	set_cc_for_build
+	IS_GLIBC=0
+	test x"${LIBC}" = xgnu && IS_GLIBC=1
+	sed 's/^	//' << EOF > "$dummy.c"
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#undef mips64
+	#undef mips64el
+	#if ${IS_GLIBC} && defined(_ABI64)
+	LIBCABI=gnuabi64
+	#else
+	#if ${IS_GLIBC} && defined(_ABIN32)
+	LIBCABI=gnuabin32
+	#else
+	LIBCABI=${LIBC}
+	#endif
+	#endif
 
-        #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
-        CPU=mipsisa64r6
-        #else
-        #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
-        CPU=mipsisa32r6
-        #else
-        #if defined(__mips64)
-        CPU=mips64
-        #else
-        CPU=mips
-        #endif
-        #endif
-        #endif
+	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa64r6
+	#else
+	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa32r6
+	#else
+	#if defined(__mips64)
+	CPU=mips64
+	#else
+	CPU=mips
+	#endif
+	#endif
+	#endif
 
-        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-        MIPS_ENDIAN=el
-        #else
-        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-        MIPS_ENDIAN=
-        #else
-        MIPS_ENDIAN=
-        #endif
-        #endif
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	MIPS_ENDIAN=el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	MIPS_ENDIAN=
+	#else
+	MIPS_ENDIAN=
+	#endif
+	#endif
 EOF
-        eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`"
-        test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
-        ;;
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`"
+	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
+	;;
     mips64el:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     openrisc*:Linux:*:*)
-        echo or1k-unknown-linux-"$LIBC"
-        exit ;;
+	echo or1k-unknown-linux-"$LIBC"
+	exit ;;
     or32:Linux:*:* | or1k*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     padre:Linux:*:*)
-        echo sparc-unknown-linux-"$LIBC"
-        exit ;;
+	echo sparc-unknown-linux-"$LIBC"
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-        echo hppa64-unknown-linux-"$LIBC"
-        exit ;;
+	echo hppa64-unknown-linux-"$LIBC"
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
-        # Look for CPU level
-        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-          PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
-          PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
-          *)    echo hppa-unknown-linux-"$LIBC" ;;
-        esac
-        exit ;;
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+	  *)    echo hppa-unknown-linux-"$LIBC" ;;
+	esac
+	exit ;;
     ppc64:Linux:*:*)
-        echo powerpc64-unknown-linux-"$LIBC"
-        exit ;;
+	echo powerpc64-unknown-linux-"$LIBC"
+	exit ;;
     ppc:Linux:*:*)
-        echo powerpc-unknown-linux-"$LIBC"
-        exit ;;
+	echo powerpc-unknown-linux-"$LIBC"
+	exit ;;
     ppc64le:Linux:*:*)
-        echo powerpc64le-unknown-linux-"$LIBC"
-        exit ;;
+	echo powerpc64le-unknown-linux-"$LIBC"
+	exit ;;
     ppcle:Linux:*:*)
-        echo powerpcle-unknown-linux-"$LIBC"
-        exit ;;
+	echo powerpcle-unknown-linux-"$LIBC"
+	exit ;;
     riscv32:Linux:*:* | riscv64:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-        echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
+	exit ;;
     sh64*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     sh*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     tile*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     vax:Linux:*:*)
-        echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+	exit ;;
     x86_64:Linux:*:*)
-        echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	exit ;;
     xtensa*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     i*86:DYNIX/ptx:4*:*)
-        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-        # earlier versions are messed up and put the nodename in both
-        # sysname and nodename.
-        echo i386-sequent-sysv4
-        exit ;;
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-        # I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-        echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
-        exit ;;
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
+	exit ;;
     i*86:OS/2:*:*)
-        # If we were able to find `uname', then EMX Unix compatibility
-        # is probably installed.
-        echo "$UNAME_MACHINE"-pc-os2-emx
-        exit ;;
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo "$UNAME_MACHINE"-pc-os2-emx
+	exit ;;
     i*86:XTS-300:*:STOP)
-        echo "$UNAME_MACHINE"-unknown-stop
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-stop
+	exit ;;
     i*86:atheos:*:*)
-        echo "$UNAME_MACHINE"-unknown-atheos
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-atheos
+	exit ;;
     i*86:syllable:*:*)
-        echo "$UNAME_MACHINE"-pc-syllable
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-syllable
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-        echo i386-unknown-lynxos"$UNAME_RELEASE"
-        exit ;;
+	echo i386-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
     i*86:*DOS:*:*)
-        echo "$UNAME_MACHINE"-pc-msdosdjgpp
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-msdosdjgpp
+	exit ;;
     i*86:*:4.*:*)
-        UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
-        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-                echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
-        else
-                echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
-        fi
-        exit ;;
+	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+	else
+		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+	fi
+	exit ;;
     i*86:*:5:[678]*)
-        # UnixWare 7.x, OpenUNIX and OpenServer 6.
-        case `/bin/uname -X | grep "^Machine"` in
-            *486*)             UNAME_MACHINE=i486 ;;
-            *Pentium)             UNAME_MACHINE=i586 ;;
-            *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-        esac
-        echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
-        exit ;;
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
+	exit ;;
     i*86:*:3.2:*)
-        if test -f /usr/options/cb.name; then
-                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-                echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
-        elif /bin/uname -X 2>/dev/null >/dev/null ; then
-                UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-                (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-                (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-                        && UNAME_MACHINE=i586
-                (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-                        && UNAME_MACHINE=i686
-                (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-                        && UNAME_MACHINE=i686
-                echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
-        else
-                echo "$UNAME_MACHINE"-pc-sysv32
-        fi
-        exit ;;
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+	else
+		echo "$UNAME_MACHINE"-pc-sysv32
+	fi
+	exit ;;
     pc:*:*:*)
-        # Left here for compatibility:
-        # 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 configure will decide that
-        # this is a cross-build.
-        echo i586-pc-msdosdjgpp
-        exit ;;
+	# Left here for compatibility:
+	# 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 configure will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
     Intel:Mach:3*:*)
-        echo i386-pc-mach3
-        exit ;;
+	echo i386-pc-mach3
+	exit ;;
     paragon:*:*:*)
-        echo i860-intel-osf1
-        exit ;;
+	echo i860-intel-osf1
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
-        if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-          echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
-        else # Add other i860-SVR4 vendors below as they are discovered.
-          echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
-        fi
-        exit ;;
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
+	fi
+	exit ;;
     mini*:CTIX:SYS*5:*)
-        # "miniframe"
-        echo m68010-convergent-sysv
-        exit ;;
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
-        echo m68k-convergent-sysv
-        exit ;;
+	echo m68k-convergent-sysv
+	exit ;;
     M680?0:D-NIX:5.3:*)
-        echo m68k-diab-dnix
-        exit ;;
+	echo m68k-diab-dnix
+	exit ;;
     M68*:*:R3V[5678]*:*)
-        test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-        OS_REL=''
-        test -r /etc/.relid \
-        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
-        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-          && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-        OS_REL='.3'
-        test -r /etc/.relid \
-            && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-            && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
-        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-            && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
-        /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-            && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-        echo m68k-unknown-lynxos"$UNAME_RELEASE"
-        exit ;;
+	echo m68k-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
-        echo m68k-atari-sysv4
-        exit ;;
+	echo m68k-atari-sysv4
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
-        echo sparc-unknown-lynxos"$UNAME_RELEASE"
-        exit ;;
+	echo sparc-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
     rs6000:LynxOS:2.*:*)
-        echo rs6000-unknown-lynxos"$UNAME_RELEASE"
-        exit ;;
+	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-        echo powerpc-unknown-lynxos"$UNAME_RELEASE"
-        exit ;;
+	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
-        echo mips-dde-sysv"$UNAME_RELEASE"
-        exit ;;
+	echo mips-dde-sysv"$UNAME_RELEASE"
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
-        echo mips-sni-sysv4
-        exit ;;
+	echo mips-sni-sysv4
+	exit ;;
     RM*:SINIX-*:*:*)
-        echo mips-sni-sysv4
-        exit ;;
+	echo mips-sni-sysv4
+	exit ;;
     *:SINIX-*:*:*)
-        if uname -p 2>/dev/null >/dev/null ; then
-                UNAME_MACHINE=`(uname -p) 2>/dev/null`
-                echo "$UNAME_MACHINE"-sni-sysv4
-        else
-                echo ns32k-sni-sysv
-        fi
-        exit ;;
-    PENTIUM:*:4.0*:*)        # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                        # says <Ri...@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo "$UNAME_MACHINE"-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Ri...@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
-        # From Gerald Hewes <he...@openmarket.com>.
-        # How about differentiating between stratus architectures? -djm
-        echo hppa1.1-stratus-sysv4
-        exit ;;
+	# From Gerald Hewes <he...@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
     *:*:*:FTX*)
-        # From seanf@swdc.stratus.com.
-        echo i860-stratus-sysv4
-        exit ;;
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
     i*86:VOS:*:*)
-        # From Paul.Green@stratus.com.
-        echo "$UNAME_MACHINE"-stratus-vos
-        exit ;;
+	# From Paul.Green@stratus.com.
+	echo "$UNAME_MACHINE"-stratus-vos
+	exit ;;
     *:VOS:*:*)
-        # From Paul.Green@stratus.com.
-        echo hppa1.1-stratus-vos
-        exit ;;
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
     mc68*:A/UX:*:*)
-        echo m68k-apple-aux"$UNAME_RELEASE"
-        exit ;;
+	echo m68k-apple-aux"$UNAME_RELEASE"
+	exit ;;
     news*:NEWS-OS:6*:*)
-        echo mips-sony-newsos6
-        exit ;;
+	echo mips-sony-newsos6
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-        if [ -d /usr/nec ]; then
-                echo mips-nec-sysv"$UNAME_RELEASE"
-        else
-                echo mips-unknown-sysv"$UNAME_RELEASE"
-        fi
-        exit ;;
-    BeBox:BeOS:*:*)        # BeOS running on hardware made by Be, PPC only.
-        echo powerpc-be-beos
-        exit ;;
-    BeMac:BeOS:*:*)        # BeOS running on Mac or Mac clone, PPC only.
-        echo powerpc-apple-beos
-        exit ;;
-    BePC:BeOS:*:*)        # BeOS running on Intel PC compatible.
-        echo i586-pc-beos
-        exit ;;
-    BePC:Haiku:*:*)        # Haiku running on Intel PC compatible.
-        echo i586-pc-haiku
-        exit ;;
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv"$UNAME_RELEASE"
+	else
+		echo mips-unknown-sysv"$UNAME_RELEASE"
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     x86_64:Haiku:*:*)
-        echo x86_64-unknown-haiku
-        exit ;;
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
-        echo sx4-nec-superux"$UNAME_RELEASE"
-        exit ;;
+	echo sx4-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-5:SUPER-UX:*:*)
-        echo sx5-nec-superux"$UNAME_RELEASE"
-        exit ;;
+	echo sx5-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-6:SUPER-UX:*:*)
-        echo sx6-nec-superux"$UNAME_RELEASE"
-        exit ;;
+	echo sx6-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-7:SUPER-UX:*:*)
-        echo sx7-nec-superux"$UNAME_RELEASE"
-        exit ;;
+	echo sx7-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-8:SUPER-UX:*:*)
-        echo sx8-nec-superux"$UNAME_RELEASE"
-        exit ;;
+	echo sx8-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-8R:SUPER-UX:*:*)
-        echo sx8r-nec-superux"$UNAME_RELEASE"
-        exit ;;
+	echo sx8r-nec-superux"$UNAME_RELEASE"
+	exit ;;
     SX-ACE:SUPER-UX:*:*)
-        echo sxace-nec-superux"$UNAME_RELEASE"
-        exit ;;
+	echo sxace-nec-superux"$UNAME_RELEASE"
+	exit ;;
     Power*:Rhapsody:*:*)
-        echo powerpc-apple-rhapsody"$UNAME_RELEASE"
-        exit ;;
+	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
+	exit ;;
     *:Rhapsody:*:*)
-        echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
-        exit ;;
+	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
+	exit ;;
     *:Darwin:*:*)
-        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-        set_cc_for_build
-        if test "$UNAME_PROCESSOR" = unknown ; then
-            UNAME_PROCESSOR=powerpc
-        fi
-        if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; 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
-                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
-            # that puts up a graphical alert prompting to install
-            # developer tools.  Any system running Mac OS X 10.7 or
-            # later (Darwin 11 and later) is required to have a 64-bit
-            # processor. This is not true of the ARM version of Darwin
-            # that Apple uses in portable devices.
-            UNAME_PROCESSOR=x86_64
-        fi
-        echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
-        exit ;;
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; 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
+		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
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
+	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-        UNAME_PROCESSOR=`uname -p`
-        if test "$UNAME_PROCESSOR" = x86; then
-                UNAME_PROCESSOR=i386
-                UNAME_MACHINE=pc
-        fi
-        echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
-        exit ;;
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = x86; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+	exit ;;
     *:QNX:*:4*)
-        echo i386-pc-qnx
-        exit ;;
+	echo i386-pc-qnx
+	exit ;;
     NEO-*:NONSTOP_KERNEL:*:*)
-        echo neo-tandem-nsk"$UNAME_RELEASE"
-        exit ;;
+	echo neo-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
     NSE-*:NONSTOP_KERNEL:*:*)
-        echo nse-tandem-nsk"$UNAME_RELEASE"
-        exit ;;
+	echo nse-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
     NSR-*:NONSTOP_KERNEL:*:*)
-        echo nsr-tandem-nsk"$UNAME_RELEASE"
-        exit ;;
+	echo nsr-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
     NSV-*:NONSTOP_KERNEL:*:*)
-        echo nsv-tandem-nsk"$UNAME_RELEASE"
-        exit ;;
+	echo nsv-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
     NSX-*:NONSTOP_KERNEL:*:*)
-        echo nsx-tandem-nsk"$UNAME_RELEASE"
-        exit ;;
+	echo nsx-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
     *:NonStop-UX:*:*)
-        echo mips-compaq-nonstopux
-        exit ;;
+	echo mips-compaq-nonstopux
+	exit ;;
     BS2000:POSIX*:*:*)
-        echo bs2000-siemens-sysv
-        exit ;;
+	echo bs2000-siemens-sysv
+	exit ;;
     DS/*:UNIX_System_V:*:*)
-        echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
-        exit ;;
+	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
+	exit ;;
     *:Plan9:*:*)
-        # "uname -m" is not consistent, so use $cputype instead. 386
-        # is converted to i386 for consistency with other x86
-        # operating systems.
-        # shellcheck disable=SC2154
-        if test "$cputype" = 386; then
-            UNAME_MACHINE=i386
-        else
-            UNAME_MACHINE="$cputype"
-        fi
-        echo "$UNAME_MACHINE"-unknown-plan9
-        exit ;;
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	# shellcheck disable=SC2154
+	if test "$cputype" = 386; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo "$UNAME_MACHINE"-unknown-plan9
+	exit ;;
     *:TOPS-10:*:*)
-        echo pdp10-unknown-tops10
-        exit ;;
+	echo pdp10-unknown-tops10
+	exit ;;
     *:TENEX:*:*)
-        echo pdp10-unknown-tenex
-        exit ;;
+	echo pdp10-unknown-tenex
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-        echo pdp10-dec-tops20
-        exit ;;
+	echo pdp10-dec-tops20
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-        echo pdp10-xkl-tops20
-        exit ;;
+	echo pdp10-xkl-tops20
+	exit ;;
     *:TOPS-20:*:*)
-        echo pdp10-unknown-tops20
-        exit ;;
+	echo pdp10-unknown-tops20
+	exit ;;
     *:ITS:*:*)
-        echo pdp10-unknown-its
-        exit ;;
+	echo pdp10-unknown-its
+	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux"$UNAME_RELEASE"
-        exit ;;
+	echo mips-sei-seiux"$UNAME_RELEASE"
+	exit ;;
     *:DragonFly:*:*)
-        echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+	exit ;;
     *:*VMS:*:*)
-        UNAME_MACHINE=`(uname -p) 2>/dev/null`
-        case "$UNAME_MACHINE" in
-            A*) echo alpha-dec-vms ; exit ;;
-            I*) echo ia64-dec-vms ; exit ;;
-            V*) echo vax-dec-vms ; exit ;;
-        esac ;;
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "$UNAME_MACHINE" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
     *:XENIX:*:SysV)
-        echo i386-pc-xenix
-        exit ;;
+	echo i386-pc-xenix
+	exit ;;
     i*86:skyos:*:*)
-        echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
+	exit ;;
     i*86:rdos:*:*)
-        echo "$UNAME_MACHINE"-pc-rdos
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-rdos
+	exit ;;
     i*86:AROS:*:*)
-        echo "$UNAME_MACHINE"-pc-aros
-        exit ;;
+	echo "$UNAME_MACHINE"-pc-aros
+	exit ;;
     x86_64:VMkernel:*:*)
-        echo "$UNAME_MACHINE"-unknown-esx
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-esx
+	exit ;;
     amd64:Isilon\ OneFS:*:*)
-        echo x86_64-unknown-onefs
-        exit ;;
+	echo x86_64-unknown-onefs
+	exit ;;
     *:Unleashed:*:*)
-        echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
-        exit ;;
+	echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
+	exit ;;
 esac
 
 # No uname command or uname output not recognized.
@@ -1580,7 +1580,7 @@ main ()
   printf ("mips-dec-ultrix%s\n", un.release); exit (0);
 #else
   printf ("mips-dec-ultrix\n"); exit (0);
-#endif
+#endif  
 #endif
 #endif
 
@@ -1593,7 +1593,7 @@ main ()
 EOF
 
 $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-        { echo "$SYSTEM_NAME"; exit; }
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
@@ -1602,13 +1602,13 @@ echo "$0: unable to guess system type" >&2
 
 case "$UNAME_MACHINE:$UNAME_SYSTEM" in
     mips:Linux | mips64:Linux)
-        # If we got here on MIPS GNU/Linux, output extra information.
-        cat >&2 <<EOF
+	# If we got here on MIPS GNU/Linux, output extra information.
+	cat >&2 <<EOF
 
 NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
 the system type. Please install a C compiler and try again.
 EOF
-        ;;
+	;;
 esac
 
 cat >&2 <<EOF
diff --git a/src/native/unix/support/config.sub b/src/native/unix/support/config.sub
index 7cb4844..22371e6 100755
--- a/src/native/unix/support/config.sub
+++ b/src/native/unix/support/config.sub
@@ -45,9 +45,9 @@ timestamp='2019-01-05'
 
 # 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,.*/,,'`
@@ -86,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" >&2
@@ -118,1162 +118,1162 @@ EOF
 
 # Separate into logical components for further validation
 case $1 in
-        *-*-*-*-*)
-                echo Invalid configuration \`"$1"\': more than four components >&2
-                exit 1
-                ;;
-        *-*-*-*)
-                basic_machine=$field1-$field2
-                os=$field3-$field4
-                ;;
-        *-*-*)
-                # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
-                # parts
-                maybe_os=$field2-$field3
-                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* \
-                        | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-                        | storm-chaos* | os2-emx* | rtmk-nova*)
-                                basic_machine=$field1
-                                os=$maybe_os
-                                ;;
-                        android-linux)
-                                basic_machine=$field1-unknown
-                                os=linux-android
-                                ;;
-                        *)
-                                basic_machine=$field1-$field2
-                                os=$field3
-                                ;;
-                esac
-                ;;
-        *-*)
-                # A lone config we happen to match not fitting any pattern
-                case $field1-$field2 in
-                        decstation-3100)
-                                basic_machine=mips-dec
-                                os=
-                                ;;
-                        *-*)
-                                # Second component is usually, but not always the OS
-                                case $field2 in
-                                        # Prevent following clause from handling this valid os
-                                        sun*os*)
-                                                basic_machine=$field1
-                                                os=$field2
-                                                ;;
-                                        # Manufacturers
-                                        dec* | mips* | sequent* | encore* | pc533* | 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* | sim | cisco \
-                                        | oki | wec | wrs | winbond)
-                                                basic_machine=$field1-$field2
-                                                os=
-                                                ;;
-                                        *)
-                                                basic_machine=$field1
-                                                os=$field2
-                                                ;;
-                                esac
-                        ;;
-                esac
-                ;;
-        *)
-                # Convert single-component short-hands not valid as part of
-                # multi-component configurations.
-                case $field1 in
-                        386bsd)
-                                basic_machine=i386-pc
-                                os=bsd
-                                ;;
-                        a29khif)
-                                basic_machine=a29k-amd
-                                os=udi
-                                ;;
-                        adobe68k)
-                                basic_machine=m68010-adobe
-                                os=scout
-                                ;;
-                        alliant)
-                                basic_machine=fx80-alliant
-                                os=
-                                ;;
-                        altos | altos3068)
-                                basic_machine=m68k-altos
-                                os=
-                                ;;
-                        am29k)
-                                basic_machine=a29k-none
-                                os=bsd
-                                ;;
-                        amdahl)
-                                basic_machine=580-amdahl
-                                os=sysv
-                                ;;
-                        amiga)
-                                basic_machine=m68k-unknown
-                                os=
-                                ;;
-                        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
-                                ;;
-                        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)
-                                basic_machine=j90-cray
-                                os=unicos
-                                ;;
-                        crds | unos)
-                                basic_machine=m68k-crds
-                                os=
-                                ;;
-                        da30)
-                                basic_machine=m68k-da30
-                                os=
-                                ;;
-                        decstation | pmax | pmin | dec3100 | decstatn)
-                                basic_machine=mips-dec
-                                os=
-                                ;;
-                        delta88)
-                                basic_machine=m88k-motorola
-                                os=sysv3
-                                ;;
-                        dicos)
-                                basic_machine=i686-pc
-                                os=dicos
-                                ;;
-                        djgpp)
-                                basic_machine=i586-pc
-                                os=msdosdjgpp
-                                ;;
-                        ebmon29k)
-                                basic_machine=a29k-amd
-                                os=ebmon
-                                ;;
-                        es1800 | OSE68k | ose68k | ose | OSE)
-                                basic_machine=m68k-ericsson
-                                os=ose
-                                ;;
-                        gmicro)
-                                basic_machine=tron-gmicro
-                                os=sysv
-                                ;;
-                        go32)
-                                basic_machine=i386-pc
-                                os=go32
-                                ;;
-                        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
-                                ;;
-                        hppaosf)
-                                basic_machine=hppa1.1-hp
-                                os=osf
-                                ;;
-                        hppro)
-                                basic_machine=hppa1.1-hp
-                                os=proelf
-                                ;;
-                        i386mach)
-                                basic_machine=i386-mach
-                                os=mach
-                                ;;
-                        vsta)
-                                basic_machine=i386-pc
-                                os=vsta
-                                ;;
-                        isi68 | isi)
-                                basic_machine=m68k-isi
-                                os=sysv
-                                ;;
-                        m68knommu)
-                                basic_machine=m68k-unknown
-                                os=linux
-                                ;;
-                        magnum | m3230)
-                                basic_machine=mips-mips
-                                os=sysv
-                                ;;
-                        merlin)
-                                basic_machine=ns32k-utek
-                                os=sysv
-                                ;;
-                        mingw64)
-                                basic_machine=x86_64-pc
-                                os=mingw64
-                                ;;
-                        mingw32)
-                                basic_machine=i686-pc
-                                os=mingw32
-                                ;;
-                        mingw32ce)
-                                basic_machine=arm-unknown
-                                os=mingw32ce
-                                ;;
-                        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
-                                ;;
-                        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-pc
-                                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
-                                ;;
-                        necv70)
-                                basic_machine=v70-nec
-                                os=sysv
-                                ;;
-                        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
-                                ;;
-                        os400)
-                                basic_machine=powerpc-ibm
-                                os=os400
-                                ;;
-                        OSE68000 | ose68000)
-                                basic_machine=m68000-ericsson
-                                os=ose
-                                ;;
-                        os68k)
-                                basic_machine=m68k-none
-                                os=os68k
-                                ;;
-                        paragon)
-                                basic_machine=i860-intel
-                                os=osf
-                                ;;
-                        parisc)
-                                basic_machine=hppa-unknown
-                                os=linux
-                                ;;
-                        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
-                                ;;
-                        sa29200)
-                                basic_machine=a29k-amd
-                                os=udi
-                                ;;
-                        sei)
-                                basic_machine=mips-sei
-                                os=seiux
-                                ;;
-                        sequent)
-                                basic_machine=i386-sequent
-                                os=
-                                ;;
-                        sps7)
-                                basic_machine=m68k-bull
-                                os=sysv2
-                                ;;
-                        st2000)
-                                basic_machine=m68k-tandem
-                                os=
-                                ;;
-                        stratus)
-                                basic_machine=i860-stratus
-                                os=sysv4
-                                ;;
-                        sun2)
-                                basic_machine=m68000-sun
-                                os=
-                                ;;
-                        sun2os3)
-                                basic_machine=m68000-sun
-                                os=sunos3
-                                ;;
-                        sun2os4)
-                                basic_machine=m68000-sun
-                                os=sunos4
-                                ;;
-                        sun3)
-                                basic_machine=m68k-sun
-                                os=
-                                ;;
-                        sun3os3)
-                                basic_machine=m68k-sun
-                                os=sunos3
-                                ;;
-                        sun3os4)
-                                basic_machine=m68k-sun
-                                os=sunos4
-                                ;;
-                        sun4)
-                                basic_machine=sparc-sun
-                                os=
-                                ;;
-                        sun4os3)
-                                basic_machine=sparc-sun
-                                os=sunos3
-                                ;;
-                        sun4os4)
-                                basic_machine=sparc-sun
-                                os=sunos4
-                                ;;
-                        sun4sol2)
-                                basic_machine=sparc-sun
-                                os=solaris2
-                                ;;
-                        sun386 | sun386i | roadrunner)
-                                basic_machine=i386-sun
-                                os=
-                                ;;
-                        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
-                                ;;
-                        toad1)
-                                basic_machine=pdp10-xkl
-                                os=tops20
-                                ;;
-                        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
-                                ;;
-                        vxworks960)
-                                basic_machine=i960-wrs
-                                os=vxworks
-                                ;;
-                        vxworks68)
-                                basic_machine=m68k-wrs
-                                os=vxworks
-                                ;;
-                        vxworks29k)
-                                basic_machine=a29k-wrs
-                                os=vxworks
-                                ;;
-                        xbox)
-                                basic_machine=i686-pc
-                                os=mingw32
-                                ;;
-                        ymp)
-                                basic_machine=ymp-cray
-                                os=unicos
-                                ;;
-                        *)
-                                basic_machine=$1
-                                os=
-                                ;;
-                esac
-                ;;
+	*-*-*-*-*)
+		echo Invalid configuration \`"$1"\': more than four components >&2
+		exit 1
+		;;
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		os=$field3-$field4
+		;;
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3
+		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* \
+			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+			| storm-chaos* | os2-emx* | rtmk-nova*)
+				basic_machine=$field1
+				os=$maybe_os
+				;;
+			android-linux)
+				basic_machine=$field1-unknown
+				os=linux-android
+				;;
+			*)
+				basic_machine=$field1-$field2
+				os=$field3
+				;;
+		esac
+		;;
+	*-*)
+		# A lone config we happen to match not fitting any pattern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
+				os=
+				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | 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* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						os=
+						;;
+					*)
+						basic_machine=$field1
+						os=$field2
+						;;
+				esac
+			;;
+		esac
+		;;
+	*)
+		# Convert single-component short-hands not valid as part of
+		# multi-component configurations.
+		case $field1 in
+			386bsd)
+				basic_machine=i386-pc
+				os=bsd
+				;;
+			a29khif)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			adobe68k)
+				basic_machine=m68010-adobe
+				os=scout
+				;;
+			alliant)
+				basic_machine=fx80-alliant
+				os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				os=
+				;;
+			am29k)
+				basic_machine=a29k-none
+				os=bsd
+				;;
+			amdahl)
+				basic_machine=580-amdahl
+				os=sysv
+				;;
+			amiga)
+				basic_machine=m68k-unknown
+				os=
+				;;
+			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
+				;;
+			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)
+				basic_machine=j90-cray
+				os=unicos
+				;;
+			crds | unos)
+				basic_machine=m68k-crds
+				os=
+				;;
+			da30)
+				basic_machine=m68k-da30
+				os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				os=
+				;;
+			delta88)
+				basic_machine=m88k-motorola
+				os=sysv3
+				;;
+			dicos)
+				basic_machine=i686-pc
+				os=dicos
+				;;
+			djgpp)
+				basic_machine=i586-pc
+				os=msdosdjgpp
+				;;
+			ebmon29k)
+				basic_machine=a29k-amd
+				os=ebmon
+				;;
+			es1800 | OSE68k | ose68k | ose | OSE)
+				basic_machine=m68k-ericsson
+				os=ose
+				;;
+			gmicro)
+				basic_machine=tron-gmicro
+				os=sysv
+				;;
+			go32)
+				basic_machine=i386-pc
+				os=go32
+				;;
+			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
+				;;
+			hppaosf)
+				basic_machine=hppa1.1-hp
+				os=osf
+				;;
+			hppro)
+				basic_machine=hppa1.1-hp
+				os=proelf
+				;;
+			i386mach)
+				basic_machine=i386-mach
+				os=mach
+				;;
+			vsta)
+				basic_machine=i386-pc
+				os=vsta
+				;;
+			isi68 | isi)
+				basic_machine=m68k-isi
+				os=sysv
+				;;
+			m68knommu)
+				basic_machine=m68k-unknown
+				os=linux
+				;;
+			magnum | m3230)
+				basic_machine=mips-mips
+				os=sysv
+				;;
+			merlin)
+				basic_machine=ns32k-utek
+				os=sysv
+				;;
+			mingw64)
+				basic_machine=x86_64-pc
+				os=mingw64
+				;;
+			mingw32)
+				basic_machine=i686-pc
+				os=mingw32
+				;;
+			mingw32ce)
+				basic_machine=arm-unknown
+				os=mingw32ce
+				;;
+			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
+				;;
+			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-pc
+				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
+				;;
+			necv70)
+				basic_machine=v70-nec
+				os=sysv
+				;;
+			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
+				;;
+			os400)
+				basic_machine=powerpc-ibm
+				os=os400
+				;;
+			OSE68000 | ose68000)
+				basic_machine=m68000-ericsson
+				os=ose
+				;;
+			os68k)
+				basic_machine=m68k-none
+				os=os68k
+				;;
+			paragon)
+				basic_machine=i860-intel
+				os=osf
+				;;
+			parisc)
+				basic_machine=hppa-unknown
+				os=linux
+				;;
+			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
+				;;
+			sa29200)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			sei)
+				basic_machine=mips-sei
+				os=seiux
+				;;
+			sequent)
+				basic_machine=i386-sequent
+				os=
+				;;
+			sps7)
+				basic_machine=m68k-bull
+				os=sysv2
+				;;
+			st2000)
+				basic_machine=m68k-tandem
+				os=
+				;;
+			stratus)
+				basic_machine=i860-stratus
+				os=sysv4
+				;;
+			sun2)
+				basic_machine=m68000-sun
+				os=
+				;;
+			sun2os3)
+				basic_machine=m68000-sun
+				os=sunos3
+				;;
+			sun2os4)
+				basic_machine=m68000-sun
+				os=sunos4
+				;;
+			sun3)
+				basic_machine=m68k-sun
+				os=
+				;;
+			sun3os3)
+				basic_machine=m68k-sun
+				os=sunos3
+				;;
+			sun3os4)
+				basic_machine=m68k-sun
+				os=sunos4
+				;;
+			sun4)
+				basic_machine=sparc-sun
+				os=
+				;;
+			sun4os3)
+				basic_machine=sparc-sun
+				os=sunos3
+				;;
+			sun4os4)
+				basic_machine=sparc-sun
+				os=sunos4
+				;;
+			sun4sol2)
+				basic_machine=sparc-sun
+				os=solaris2
+				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				os=
+				;;
+			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
+				;;
+			toad1)
+				basic_machine=pdp10-xkl
+				os=tops20
+				;;
+			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
+				;;
+			vxworks960)
+				basic_machine=i960-wrs
+				os=vxworks
+				;;
+			vxworks68)
+				basic_machine=m68k-wrs
+				os=vxworks
+				;;
+			vxworks29k)
+				basic_machine=a29k-wrs
+				os=vxworks
+				;;
+			xbox)
+				basic_machine=i686-pc
+				os=mingw32
+				;;
+			ymp)
+				basic_machine=ymp-cray
+				os=unicos
+				;;
+			*)
+				basic_machine=$1
+				os=
+				;;
+		esac
+		;;
 esac
 
 # Decode 1-component or ad-hoc basic machines
 case $basic_machine in
-        # 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)
-                cpu=hppa1.1
-                vendor=winbond
-                ;;
-        op50n)
-                cpu=hppa1.1
-                vendor=oki
-                ;;
-        op60c)
-                cpu=hppa1.1
-                vendor=oki
-                ;;
-        ibm*)
-                cpu=i370
-                vendor=ibm
-                ;;
-        orion105)
-                cpu=clipper
-                vendor=highlevel
-                ;;
-        mac | mpw | mac-mpw)
-                cpu=m68k
-                vendor=apple
-                ;;
-        pmac | pmac-mpw)
-                cpu=powerpc
-                vendor=apple
-                ;;
+	# 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)
+		cpu=hppa1.1
+		vendor=winbond
+		;;
+	op50n)
+		cpu=hppa1.1
+		vendor=oki
+		;;
+	op60c)
+		cpu=hppa1.1
+		vendor=oki
+		;;
+	ibm*)
+		cpu=i370
+		vendor=ibm
+		;;
+	orion105)
+		cpu=clipper
+		vendor=highlevel
+		;;
+	mac | mpw | mac-mpw)
+		cpu=m68k
+		vendor=apple
+		;;
+	pmac | pmac-mpw)
+		cpu=powerpc
+		vendor=apple
+		;;
 
-        # Recognize the various machine names and aliases which stand
-        # for a CPU type and a company and sometimes even an OS.
-        3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-                cpu=m68000
-                vendor=att
-                ;;
-        3b*)
-                cpu=we32k
-                vendor=att
-                ;;
-        bluegene*)
-                cpu=powerpc
-                vendor=ibm
-                os=cnk
-                ;;
-        decsystem10* | dec10*)
-                cpu=pdp10
-                vendor=dec
-                os=tops10
-                ;;
-        decsystem20* | dec20*)
-                cpu=pdp10
-                vendor=dec
-                os=tops20
-                ;;
-        delta | 3300 | motorola-3300 | motorola-delta \
-              | 3300-motorola | delta-motorola)
-                cpu=m68k
-                vendor=motorola
-                ;;
-        dpx2*)
-                cpu=m68k
-                vendor=bull
-                os=sysv3
-                ;;
-        encore | umax | mmax)
-                cpu=ns32k
-                vendor=encore
-                ;;
-        elxsi)
-                cpu=elxsi
-                vendor=elxsi
-                os=${os:-bsd}
-                ;;
-        fx2800)
-                cpu=i860
-                vendor=alliant
-                ;;
-        genix)
-                cpu=ns32k
-                vendor=ns
-                ;;
-        h3050r* | hiux*)
-                cpu=hppa1.1
-                vendor=hitachi
-                os=hiuxwe2
-                ;;
-        hp3k9[0-9][0-9] | hp9[0-9][0-9])
-                cpu=hppa1.0
-                vendor=hp
-                ;;
-        hp9k2[0-9][0-9] | hp9k31[0-9])
-                cpu=m68000
-                vendor=hp
-                ;;
-        hp9k3[2-9][0-9])
-                cpu=m68k
-                vendor=hp
-                ;;
-        hp9k6[0-9][0-9] | hp6[0-9][0-9])
-                cpu=hppa1.0
-                vendor=hp
-                ;;
-        hp9k7[0-79][0-9] | hp7[0-79][0-9])
-                cpu=hppa1.1
-                vendor=hp
-                ;;
-        hp9k78[0-9] | hp78[0-9])
-                # FIXME: really hppa2.0-hp
-                cpu=hppa1.1
-                vendor=hp
-                ;;
-        hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-                # FIXME: really hppa2.0-hp
-                cpu=hppa1.1
-                vendor=hp
-                ;;
-        hp9k8[0-9][13679] | hp8[0-9][13679])
-                cpu=hppa1.1
-                vendor=hp
-                ;;
-        hp9k8[0-9][0-9] | hp8[0-9][0-9])
-                cpu=hppa1.0
-                vendor=hp
-                ;;
-        i*86v32)
-                cpu=`echo "$1" | sed -e 's/86.*/86/'`
-                vendor=pc
-                os=sysv32
-                ;;
-        i*86v4*)
-                cpu=`echo "$1" | sed -e 's/86.*/86/'`
-                vendor=pc
-                os=sysv4
-                ;;
-        i*86v)
-                cpu=`echo "$1" | sed -e 's/86.*/86/'`
-                vendor=pc
-                os=sysv
-                ;;
-        i*86sol2)
-                cpu=`echo "$1" | sed -e 's/86.*/86/'`
-                vendor=pc
-                os=solaris2
-                ;;
-        j90 | j90-cray)
-                cpu=j90
-                vendor=cray
-                os=${os:-unicos}
-                ;;
-        iris | iris4d)
-                cpu=mips
-                vendor=sgi
-                case $os in
-                    irix*)
-                        ;;
-                    *)
-                        os=irix4
-                        ;;
-                esac
-                ;;
-        miniframe)
-                cpu=m68000
-                vendor=convergent
-                ;;
-        *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
-                cpu=m68k
-                vendor=atari
-                os=mint
-                ;;
-        news-3600 | risc-news)
-                cpu=mips
-                vendor=sony
-                os=newsos
-                ;;
-        next | m*-next)
-                cpu=m68k
-                vendor=next
-                case $os in
-                    openstep*)
-                        ;;
-                    nextstep*)
-                        ;;
-                    ns2*)
-                      os=nextstep2
-                        ;;
-                    *)
-                      os=nextstep3
-                        ;;
-                esac
-                ;;
-        np1)
-                cpu=np1
-                vendor=gould
-                ;;
-        op50n-* | op60c-*)
-                cpu=hppa1.1
-                vendor=oki
-                os=proelf
-                ;;
-        pa-hitachi)
-                cpu=hppa1.1
-                vendor=hitachi
-                os=hiuxwe2
-                ;;
-        pbd)
-                cpu=sparc
-                vendor=tti
-                ;;
-        pbb)
-                cpu=m68k
-                vendor=tti
-                ;;
-        pc532)
-                cpu=ns32k
-                vendor=pc532
-                ;;
-        pn)
-                cpu=pn
-                vendor=gould
-                ;;
-        power)
-                cpu=power
-                vendor=ibm
-                ;;
-        ps2)
-                cpu=i386
-                vendor=ibm
-                ;;
-        rm[46]00)
-                cpu=mips
-                vendor=siemens
-                ;;
-        rtpc | rtpc-*)
-                cpu=romp
-                vendor=ibm
-                ;;
-        sde)
-                cpu=mipsisa32
-                vendor=sde
-                os=${os:-elf}
-                ;;
-        simso-wrs)
-                cpu=sparclite
-                vendor=wrs
-                os=vxworks
-                ;;
-        tower | tower-32)
-                cpu=m68k
-                vendor=ncr
-                ;;
-        vpp*|vx|vx-*)
-                cpu=f301
-                vendor=fujitsu
-                ;;
-        w65)
-                cpu=w65
-                vendor=wdc
-                ;;
-        w89k-*)
-                cpu=hppa1.1
-                vendor=winbond
-                os=proelf
-                ;;
-        none)
-                cpu=none
-                vendor=none
-                ;;
-        leon|leon[3-9])
-                cpu=sparc
-                vendor=$basic_machine
-                ;;
-        leon-*|leon[3-9]-*)
-                cpu=sparc
-                vendor=`echo "$basic_machine" | sed 's/-.*//'`
-                ;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		cpu=m68000
+		vendor=att
+		;;
+	3b*)
+		cpu=we32k
+		vendor=att
+		;;
+	bluegene*)
+		cpu=powerpc
+		vendor=ibm
+		os=cnk
+		;;
+	decsystem10* | dec10*)
+		cpu=pdp10
+		vendor=dec
+		os=tops10
+		;;
+	decsystem20* | dec20*)
+		cpu=pdp10
+		vendor=dec
+		os=tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		cpu=m68k
+		vendor=motorola
+		;;
+	dpx2*)
+		cpu=m68k
+		vendor=bull
+		os=sysv3
+		;;
+	encore | umax | mmax)
+		cpu=ns32k
+		vendor=encore
+		;;
+	elxsi)
+		cpu=elxsi
+		vendor=elxsi
+		os=${os:-bsd}
+		;;
+	fx2800)
+		cpu=i860
+		vendor=alliant
+		;;
+	genix)
+		cpu=ns32k
+		vendor=ns
+		;;
+	h3050r* | hiux*)
+		cpu=hppa1.1
+		vendor=hitachi
+		os=hiuxwe2
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		cpu=m68000
+		vendor=hp
+		;;
+	hp9k3[2-9][0-9])
+		cpu=m68k
+		vendor=hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		cpu=hppa1.1
+		vendor=hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		cpu=hppa1.0
+		vendor=hp
+		;;
+	i*86v32)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv32
+		;;
+	i*86v4*)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv4
+		;;
+	i*86v)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv
+		;;
+	i*86sol2)
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=solaris2
+		;;
+	j90 | j90-cray)
+		cpu=j90
+		vendor=cray
+		os=${os:-unicos}
+		;;
+	iris | iris4d)
+		cpu=mips
+		vendor=sgi
+		case $os in
+		    irix*)
+			;;
+		    *)
+			os=irix4
+			;;
+		esac
+		;;
+	miniframe)
+		cpu=m68000
+		vendor=convergent
+		;;
+	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		cpu=m68k
+		vendor=atari
+		os=mint
+		;;
+	news-3600 | risc-news)
+		cpu=mips
+		vendor=sony
+		os=newsos
+		;;
+	next | m*-next)
+		cpu=m68k
+		vendor=next
+		case $os in
+		    openstep*)
+		        ;;
+		    nextstep*)
+			;;
+		    ns2*)
+		      os=nextstep2
+			;;
+		    *)
+		      os=nextstep3
+			;;
+		esac
+		;;
+	np1)
+		cpu=np1
+		vendor=gould
+		;;
+	op50n-* | op60c-*)
+		cpu=hppa1.1
+		vendor=oki
+		os=proelf
+		;;
+	pa-hitachi)
+		cpu=hppa1.1
+		vendor=hitachi
+		os=hiuxwe2
+		;;
+	pbd)
+		cpu=sparc
+		vendor=tti
+		;;
+	pbb)
+		cpu=m68k
+		vendor=tti
+		;;
+	pc532)
+		cpu=ns32k
+		vendor=pc532
+		;;
+	pn)
+		cpu=pn
+		vendor=gould
+		;;
+	power)
+		cpu=power
+		vendor=ibm
+		;;
+	ps2)
+		cpu=i386
+		vendor=ibm
+		;;
+	rm[46]00)
+		cpu=mips
+		vendor=siemens
+		;;
+	rtpc | rtpc-*)
+		cpu=romp
+		vendor=ibm
+		;;
+	sde)
+		cpu=mipsisa32
+		vendor=sde
+		os=${os:-elf}
+		;;
+	simso-wrs)
+		cpu=sparclite
+		vendor=wrs
+		os=vxworks
+		;;
+	tower | tower-32)
+		cpu=m68k
+		vendor=ncr
+		;;
+	vpp*|vx|vx-*)
+		cpu=f301
+		vendor=fujitsu
+		;;
+	w65)
+		cpu=w65
+		vendor=wdc
+		;;
+	w89k-*)
+		cpu=hppa1.1
+		vendor=winbond
+		os=proelf
+		;;
+	none)
+		cpu=none
+		vendor=none
+		;;
+	leon|leon[3-9])
+		cpu=sparc
+		vendor=$basic_machine
+		;;
+	leon-*|leon[3-9]-*)
+		cpu=sparc
+		vendor=`echo "$basic_machine" | sed 's/-.*//'`
+		;;
 
-        *-*)
-                # shellcheck disable=SC2162
-                IFS="-" read cpu vendor <<EOF
+	*-*)
+		# shellcheck disable=SC2162
+		IFS="-" read cpu vendor <<EOF
 $basic_machine
 EOF
-                ;;
-        # 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)
-                cpu=$basic_machine
-                vendor=pc
-                ;;
-        # These rules are duplicated from below for sake of the special case above;
-        # i.e. things that normalized to x86 arches should also default to "pc"
-        pc98)
-                cpu=i386
-                vendor=pc
-                ;;
-        x64 | amd64)
-                cpu=x86_64
-                vendor=pc
-                ;;
-        # Recognize the basic CPU types without company name.
-        *)
-                cpu=$basic_machine
-                vendor=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)
+		cpu=$basic_machine
+		vendor=pc
+		;;
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
+	pc98)
+		cpu=i386
+		vendor=pc
+		;;
+	x64 | amd64)
+		cpu=x86_64
+		vendor=pc
+		;;
+	# Recognize the basic CPU types without company name.
+	*)
+		cpu=$basic_machine
+		vendor=unknown
+		;;
 esac
 
 unset -v basic_machine
 
 # Decode basic machines in the full and proper CPU-Company form.
 case $cpu-$vendor in
-        # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
-        # some cases the only manufacturer, in others, it is the most popular.
-        craynv-unknown)
-                vendor=cray
-                os=${os:-unicosmp}
-                ;;
-        c90-unknown | c90-cray)
-                vendor=cray
-                os=${os:-unicos}
-                ;;
-        fx80-unknown)
-                vendor=alliant
-                ;;
-        romp-unknown)
-                vendor=ibm
-                ;;
-        mmix-unknown)
-                vendor=knuth
-                ;;
-        microblaze-unknown | microblazeel-unknown)
-                vendor=xilinx
-                ;;
-        rs6000-unknown)
-                vendor=ibm
-                ;;
-        vax-unknown)
-                vendor=dec
-                ;;
-        pdp11-unknown)
-                vendor=dec
-                ;;
-        we32k-unknown)
-                vendor=att
-                ;;
-        cydra-unknown)
-                vendor=cydrome
-                ;;
-        i370-ibm*)
-                vendor=ibm
-                ;;
-        orion-unknown)
-                vendor=highlevel
-                ;;
-        xps-unknown | xps100-unknown)
-                cpu=xps100
-                vendor=honeywell
-                ;;
+	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	craynv-unknown)
+		vendor=cray
+		os=${os:-unicosmp}
+		;;
+	c90-unknown | c90-cray)
+		vendor=cray
+		os=${os:-unicos}
+		;;
+	fx80-unknown)
+		vendor=alliant
+		;;
+	romp-unknown)
+		vendor=ibm
+		;;
+	mmix-unknown)
+		vendor=knuth
+		;;
+	microblaze-unknown | microblazeel-unknown)
+		vendor=xilinx
+		;;
+	rs6000-unknown)
+		vendor=ibm
+		;;
+	vax-unknown)
+		vendor=dec
+		;;
+	pdp11-unknown)
+		vendor=dec
+		;;
+	we32k-unknown)
+		vendor=att
+		;;
+	cydra-unknown)
+		vendor=cydrome
+		;;
+	i370-ibm*)
+		vendor=ibm
+		;;
+	orion-unknown)
+		vendor=highlevel
+		;;
+	xps-unknown | xps100-unknown)
+		cpu=xps100
+		vendor=honeywell
+		;;
 
-        # Here we normalize CPU types with a missing or matching vendor
-        dpx20-unknown | dpx20-bull)
-                cpu=rs6000
-                vendor=bull
-                os=${os:-bosx}
-                ;;
+	# Here we normalize CPU types with a missing or matching vendor
+	dpx20-unknown | dpx20-bull)
+		cpu=rs6000
+		vendor=bull
+		os=${os:-bosx}
+		;;
 
-        # Here we normalize CPU types irrespective of the vendor
-        amd64-*)
-                cpu=x86_64
-                ;;
-        blackfin-*)
-                cpu=bfin
-                os=linux
-                ;;
-        c54x-*)
-                cpu=tic54x
-                ;;
-        c55x-*)
-                cpu=tic55x
-                ;;
-        c6x-*)
-                cpu=tic6x
-                ;;
-        e500v[12]-*)
-                cpu=powerpc
-                os=$os"spe"
-                ;;
-        mips3*-*)
-                cpu=mips64
-                ;;
-        ms1-*)
-                cpu=mt
-                ;;
-        m68knommu-*)
-                cpu=m68k
-                os=linux
-                ;;
-        m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
-                cpu=s12z
-                ;;
-        openrisc-*)
-                cpu=or32
-                ;;
-        parisc-*)
-                cpu=hppa
-                os=linux
-                ;;
-        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-                cpu=i586
-                ;;
-        pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
-                cpu=i686
-                ;;
-        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-                cpu=i686
-                ;;
-        pentium4-*)
-                cpu=i786
-                ;;
-        pc98-*)
-                cpu=i386
-                ;;
-        ppc-* | ppcbe-*)
-                cpu=powerpc
-                ;;
-        ppcle-* | powerpclittle-*)
-                cpu=powerpcle
-                ;;
-        ppc64-*)
-                cpu=powerpc64
-                ;;
-        ppc64le-* | powerpc64little-*)
-                cpu=powerpc64le
-                ;;
-        sb1-*)
-                cpu=mipsisa64sb1
-                ;;
-        sb1el-*)
-                cpu=mipsisa64sb1el
-                ;;
-        sh5e[lb]-*)
-                cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
-                ;;
-        spur-*)
-                cpu=spur
-                ;;
-        strongarm-* | thumb-*)
-                cpu=arm
-                ;;
-        tx39-*)
-                cpu=mipstx39
-                ;;
-        tx39el-*)
-                cpu=mipstx39el
-                ;;
-        x64-*)
-                cpu=x86_64
-                ;;
-        xscale-* | xscalee[bl]-*)
-                cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
-                ;;
+	# Here we normalize CPU types irrespective of the vendor
+	amd64-*)
+		cpu=x86_64
+		;;
+	blackfin-*)
+		cpu=bfin
+		os=linux
+		;;
+	c54x-*)
+		cpu=tic54x
+		;;
+	c55x-*)
+		cpu=tic55x
+		;;
+	c6x-*)
+		cpu=tic6x
+		;;
+	e500v[12]-*)
+		cpu=powerpc
+		os=$os"spe"
+		;;
+	mips3*-*)
+		cpu=mips64
+		;;
+	ms1-*)
+		cpu=mt
+		;;
+	m68knommu-*)
+		cpu=m68k
+		os=linux
+		;;
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		cpu=s12z
+		;;
+	openrisc-*)
+		cpu=or32
+		;;
+	parisc-*)
+		cpu=hppa
+		os=linux
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		cpu=i586
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+		cpu=i686
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		cpu=i686
+		;;
+	pentium4-*)
+		cpu=i786
+		;;
+	pc98-*)
+		cpu=i386
+		;;
+	ppc-* | ppcbe-*)
+		cpu=powerpc
+		;;
+	ppcle-* | powerpclittle-*)
+		cpu=powerpcle
+		;;
+	ppc64-*)
+		cpu=powerpc64
+		;;
+	ppc64le-* | powerpc64little-*)
+		cpu=powerpc64le
+		;;
+	sb1-*)
+		cpu=mipsisa64sb1
+		;;
+	sb1el-*)
+		cpu=mipsisa64sb1el
+		;;
+	sh5e[lb]-*)
+		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
+		;;
+	spur-*)
+		cpu=spur
+		;;
+	strongarm-* | thumb-*)
+		cpu=arm
+		;;
+	tx39-*)
+		cpu=mipstx39
+		;;
+	tx39el-*)
+		cpu=mipstx39el
+		;;
+	x64-*)
+		cpu=x86_64
+		;;
+	xscale-* | xscalee[bl]-*)
+		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+		;;
 
-        # Recognize the canonical CPU Types that limit and/or modify the
-        # company names they are paired with.
-        cr16-*)
-                os=${os:-elf}
-                ;;
-        crisv32-* | etraxfs*-*)
-                cpu=crisv32
-                vendor=axis
-                ;;
-        cris-* | etrax*-*)
-                cpu=cris
-                vendor=axis
-                ;;
-        crx-*)
-                os=${os:-elf}
-                ;;
-        neo-tandem)
-                cpu=neo
-                vendor=tandem
-                ;;
-        nse-tandem)
-                cpu=nse
-                vendor=tandem
-                ;;
-        nsr-tandem)
-                cpu=nsr
-                vendor=tandem
-                ;;
-        nsv-tandem)
-                cpu=nsv
-                vendor=tandem
-                ;;
-        nsx-tandem)
-                cpu=nsx
-                vendor=tandem
-                ;;
-        s390-*)
-                cpu=s390
-                vendor=ibm
-                ;;
-        s390x-*)
-                cpu=s390x
-                vendor=ibm
-                ;;
-        tile*-*)
-                os=${os:-linux-gnu}
-                ;;
+	# Recognize the canonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	cr16-*)
+		os=${os:-elf}
+		;;
+	crisv32-* | etraxfs*-*)
+		cpu=crisv32
+		vendor=axis
+		;;
+	cris-* | etrax*-*)
+		cpu=cris
+		vendor=axis
+		;;
+	crx-*)
+		os=${os:-elf}
+		;;
+	neo-tandem)
+		cpu=neo
+		vendor=tandem
+		;;
+	nse-tandem)
+		cpu=nse
+		vendor=tandem
+		;;
+	nsr-tandem)
+		cpu=nsr
+		vendor=tandem
+		;;
+	nsv-tandem)
+		cpu=nsv
+		vendor=tandem
+		;;
+	nsx-tandem)
+		cpu=nsx
+		vendor=tandem
+		;;
+	s390-*)
+		cpu=s390
+		vendor=ibm
+		;;
+	s390x-*)
+		cpu=s390x
+		vendor=ibm
+		;;
+	tile*-*)
+		os=${os:-linux-gnu}
+		;;
 
-        *)
-                # Recognize the canonical CPU types that are allowed with any
-                # company name.
-                case $cpu in
-                        1750a | 580 \
-                        | a29k \
-                        | aarch64 | aarch64_be \
-                        | abacus \
-                        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
-                        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
-                        | alphapca5[67] | alpha64pca5[67] \
-                        | am33_2.0 \
-                        | amdgcn \
-                        | arc | arceb \
-                        | arm  | arm[lb]e | arme[lb] | armv* \
-                        | avr | avr32 \
-                        | asmjs \
-                        | ba \
-                        | be32 | be64 \
-                        | bfin | bs2000 \
-                        | c[123]* | c30 | [cjt]90 | c4x \
-                        | c8051 | clipper | craynv | csky | cydra \
-                        | d10v | d30v | dlx | dsp16xx \
-                        | e2k | elxsi | epiphany \
-                        | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
-                        | h8300 | h8500 \
-                        | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-                        | hexagon \
-                        | i370 | i*86 | i860 | i960 | ia16 | ia64 \
-                        | ip2k | iq2000 \
-                        | k1om \
-                        | le32 | le64 \
-                        | lm32 \
-                        | m32c | m32r | m32rle \
-                        | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
-                        | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
-                        | m88110 | m88k | maxq | mb | mcore | mep | metag \
-                        | microblaze | microblazeel \
-                        | mips | mipsbe | mipseb | mipsel | mipsle \
-                        | mips16 \
-                        | mips64 | mips64eb | 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 \
-                        | mn10200 | mn10300 \
-                        | moxie \
-                        | mt \
-                        | msp430 \
-                        | nds32 | nds32le | nds32be \
-                        | nfp \
-                        | nios | nios2 | nios2eb | nios2el \
-                        | none | np1 | ns16k | ns32k | nvptx \
-                        | open8 \
-                        | or1k* \
-                        | or32 \
-                        | orion \
-                        | picochip \
-                        | pdp10 | pdp11 | pj | pjl | pn | power \
-                        | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
-                        | pru \
-                        | pyramid \
-                        | riscv | riscv32 | riscv64 \
-                        | rl78 | romp | rs6000 | rx \
-                        | score \
-                        | sh | shl \
-                        | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
-                        | sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
-                        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
-                        | sparclite \
-                        | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
-                        | spu \
-                        | tahoe \
-                        | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
-                        | tron \
-                        | ubicom32 \
-                        | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
-                        | vax \
-                        | visium \
-                        | w65 \
-                        | wasm32 | wasm64 \
-                        | we32k \
-                        | x86 | x86_64 | xc16x | xgate | xps100 \
-                        | xstormy16 | xtensa* \
-                        | ymp \
-                        | z8k | z80)
-                                ;;
+	*)
+		# Recognize the canonical CPU types that are allowed with any
+		# company name.
+		case $cpu in
+			1750a | 580 \
+			| a29k \
+			| aarch64 | aarch64_be \
+			| abacus \
+			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+			| alphapca5[67] | alpha64pca5[67] \
+			| am33_2.0 \
+			| amdgcn \
+			| arc | arceb \
+			| arm  | arm[lb]e | arme[lb] | armv* \
+			| avr | avr32 \
+			| asmjs \
+			| ba \
+			| be32 | be64 \
+			| bfin | bs2000 \
+			| c[123]* | c30 | [cjt]90 | c4x \
+			| c8051 | clipper | craynv | csky | cydra \
+			| d10v | d30v | dlx | dsp16xx \
+			| e2k | elxsi | epiphany \
+			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| h8300 | h8500 \
+			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+			| hexagon \
+			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
+			| ip2k | iq2000 \
+			| k1om \
+			| le32 | le64 \
+			| lm32 \
+			| m32c | m32r | m32rle \
+			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+			| m88110 | m88k | maxq | mb | mcore | mep | metag \
+			| microblaze | microblazeel \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64eb | 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 \
+			| mn10200 | mn10300 \
+			| moxie \
+			| mt \
+			| msp430 \
+			| nds32 | nds32le | nds32be \
+			| nfp \
+			| nios | nios2 | nios2eb | nios2el \
+			| none | np1 | ns16k | ns32k | nvptx \
+			| open8 \
+			| or1k* \
+			| or32 \
+			| orion \
+			| picochip \
+			| pdp10 | pdp11 | pj | pjl | pn | power \
+			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pru \
+			| pyramid \
+			| riscv | riscv32 | riscv64 \
+			| rl78 | romp | rs6000 | rx \
+			| score \
+			| sh | shl \
+			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sparclite \
+			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| spu \
+			| tahoe \
+			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tron \
+			| ubicom32 \
+			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| vax \
+			| visium \
+			| w65 \
+			| wasm32 | wasm64 \
+			| we32k \
+			| x86 | x86_64 | xc16x | xgate | xps100 \
+			| xstormy16 | xtensa* \
+			| ymp \
+			| z8k | z80)
+				;;
 
-                        *)
-                                echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
-                                exit 1
-                                ;;
-                esac
-                ;;
+			*)
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				exit 1
+				;;
+		esac
+		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
 case $vendor in
-        digital*)
-                vendor=dec
-                ;;
-        commodore*)
-                vendor=cbm
-                ;;
-        *)
-                ;;
+	digital*)
+		vendor=dec
+		;;
+	commodore*)
+		vendor=cbm
+		;;
+	*)
+		;;
 esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
@@ -1281,245 +1281,245 @@ 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
-                ;;
-        bluegene*)
-                os=cnk
-                ;;
-        solaris1 | solaris1.*)
-                os=`echo $os | sed -e 's|solaris1|sunos4|'`
-                ;;
-        solaris)
-                os=solaris2
-                ;;
-        unixware*)
-                os=sysv4.2uw
-                ;;
-        gnu/linux*)
-                os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-                ;;
-        # es1800 is here to avoid being matched by es* (a different OS)
-        es1800*)
-                os=ose
-                ;;
-        # Some version numbers need modification
-        chorusos*)
-                os=chorusos
-                ;;
-        isc)
-                os=isc2.2
-                ;;
-        sco6)
-                os=sco5v6
-                ;;
-        sco5)
-                os=sco3.2v5
-                ;;
-        sco4)
-                os=sco3.2v4
-                ;;
-        sco3.2.[4-9]*)
-                os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-                ;;
-        sco3.2v[4-9]* | sco5v6*)
-                # Don't forget version if it is 3.2v4 or newer.
-                ;;
-        scout)
-                # Don't match below
-                ;;
-        sco*)
-                os=sco3.2v2
-                ;;
-        psos*)
-                os=psos
-                ;;
-        # Now 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* | esix* | 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* | isc* | rtu* | xenix* \
-             | 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* | hcos* \
-             | chorusrdb* | cegcc* | glidix* \
-             | cygwin* | msys* | pe* | 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* \
-             | openstep* | oskit* | conix* | pw32* | nonstopux* \
-             | storm-chaos* | tops10* | tenex* | tops20* | its* \
-             | os2* | vos* | palmos* | uclinux* | nucleus* \
-             | morphos* | superux* | rtmk* | windiss* \
-             | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
-             | skyos* | haiku* | rdos* | toppers* | drops* | es* \
-             | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-             | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
-        # Remember, each alternative MUST END IN *, to match a version number.
-                ;;
-        qnx*)
-                case $cpu in
-                    x86 | i*86)
-                        ;;
-                    *)
-                        os=nto-$os
-                        ;;
-                esac
-                ;;
-        hiux*)
-                os=hiuxwe2
-                ;;
-        nto-qnx*)
-                ;;
-        nto*)
-                os=`echo $os | sed -e 's|nto|nto-qnx|'`
-                ;;
-        sim | xray | os68k* | v88r* \
-            | windows* | osx | abug | netware* | os9* \
-            | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
-                ;;
-        linux-dietlibc)
-                os=linux-dietlibc
-                ;;
-        linux*)
-                os=`echo $os | sed -e 's|linux|linux-gnu|'`
-                ;;
-        lynx*178)
-                os=lynxos178
-                ;;
-        lynx*5)
-                os=lynxos5
-                ;;
-        lynx*)
-                os=lynxos
-                ;;
-        mac*)
-                os=`echo "$os" | sed -e 's|mac|macos|'`
-                ;;
-        opened*)
-                os=openedition
-                ;;
-        os400*)
-                os=os400
-                ;;
-        sunos5*)
-                os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
-                ;;
-        sunos6*)
-                os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
-                ;;
-        wince*)
-                os=wince
-                ;;
-        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
-                ;;
-        *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
-                os=mint
-                ;;
-        zvmoe)
-                os=zvmoe
-                ;;
-        dicos*)
-                os=dicos
-                ;;
-        pikeos*)
-                # Until real need of OS specific support for
-                # particular features comes up, bare metal
-                # configurations are quite functional.
-                case $cpu in
-                    arm*)
-                        os=eabi
-                        ;;
-                    *)
-                        os=elf
-                        ;;
-                esac
-                ;;
-        nacl*)
-                ;;
-        ios)
-                ;;
-        none)
-                ;;
-        *-eabi)
-                ;;
-        *)
-                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
+		;;
+	bluegene*)
+		os=cnk
+		;;
+	solaris1 | solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	solaris)
+		os=solaris2
+		;;
+	unixware*)
+		os=sysv4.2uw
+		;;
+	gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# es1800 is here to avoid being matched by es* (a different OS)
+	es1800*)
+		os=ose
+		;;
+	# Some version numbers need modification
+	chorusos*)
+		os=chorusos
+		;;
+	isc)
+		os=isc2.2
+		;;
+	sco6)
+		os=sco5v6
+		;;
+	sco5)
+		os=sco3.2v5
+		;;
+	sco4)
+		os=sco3.2v4
+		;;
+	sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		;;
+	sco3.2v[4-9]* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	scout)
+		# Don't match below
+		;;
+	sco*)
+		os=sco3.2v2
+		;;
+	psos*)
+		os=psos
+		;;
+	# Now 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* | esix* | 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* | isc* | rtu* | xenix* \
+	     | 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* | hcos* \
+	     | chorusrdb* | cegcc* | glidix* \
+	     | cygwin* | msys* | pe* | 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* \
+	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	     | os2* | vos* | palmos* | uclinux* | nucleus* \
+	     | morphos* | superux* | rtmk* | windiss* \
+	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	qnx*)
+		case $cpu in
+		    x86 | i*86)
+			;;
+		    *)
+			os=nto-$os
+			;;
+		esac
+		;;
+	hiux*)
+		os=hiuxwe2
+		;;
+	nto-qnx*)
+		;;
+	nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	sim | xray | os68k* | v88r* \
+	    | windows* | osx | abug | netware* | os9* \
+	    | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
+		;;
+	linux-dietlibc)
+		os=linux-dietlibc
+		;;
+	linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	lynx*178)
+		os=lynxos178
+		;;
+	lynx*5)
+		os=lynxos5
+		;;
+	lynx*)
+		os=lynxos
+		;;
+	mac*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
+		;;
+	opened*)
+		os=openedition
+		;;
+	os400*)
+		os=os400
+		;;
+	sunos5*)
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+		;;
+	sunos6*)
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+		;;
+	wince*)
+		os=wince
+		;;
+	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
+		;;
+	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+		os=mint
+		;;
+	zvmoe)
+		os=zvmoe
+		;;
+	dicos*)
+		os=dicos
+		;;
+	pikeos*)
+		# Until real need of OS specific support for
+		# particular features comes up, bare metal
+		# configurations are quite functional.
+		case $cpu in
+		    arm*)
+			os=eabi
+			;;
+		    *)
+			os=elf
+			;;
+		esac
+		;;
+	nacl*)
+		;;
+	ios)
+		;;
+	none)
+		;;
+	*-eabi)
+		;;
+	*)
+		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+		exit 1
+		;;
 esac
 else
 
@@ -1534,257 +1534,257 @@ else
 # system, and we'll never get to this point.
 
 case $cpu-$vendor 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
-                ;;
-        clipper-intergraph)
-                os=clix
-                ;;
-        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
-                ;;
-        *-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
-                ;;
-        *-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
-                ;;
-        *-wrs)
-                os=vxworks
-                ;;
-        *)
-                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
+		;;
+	clipper-intergraph)
+		os=clix
+		;;
+	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
+		;;
+	*-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
+		;;
+	*-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
+		;;
+	*-wrs)
+		os=vxworks
+		;;
+	*)
+		os=none
+		;;
 esac
 fi
 
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
 case $vendor 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
-                                ;;
-                        clix*)
-                                vendor=intergraph
-                                ;;
-                        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
-                ;;
+	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
+				;;
+			clix*)
+				vendor=intergraph
+				;;
+			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
+		;;
 esac
 
 echo "$cpu-$vendor-$os"


[commons-daemon] 02/02: Ignore generated files

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git

commit b38e3136a1fa6187ba6aa820570f94268b6bcb04
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 3 12:25:52 2019 +0100

    Ignore generated files
---
 src/native/unix/.gitignore        | 7 +++++++
 src/native/unix/native/.gitignore | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/native/unix/.gitignore b/src/native/unix/.gitignore
new file mode 100644
index 0000000..e675b59
--- /dev/null
+++ b/src/native/unix/.gitignore
@@ -0,0 +1,7 @@
+/autom4te.cache
+/config.log
+/config.nice
+/configure
+/Makedefs
+/config.status
+/Makefile
diff --git a/src/native/unix/native/.gitignore b/src/native/unix/native/.gitignore
new file mode 100644
index 0000000..5fc607b
--- /dev/null
+++ b/src/native/unix/native/.gitignore
@@ -0,0 +1 @@
+/Makefile