--- config.guess.orig	2005-03-05 09:20:39.000000000 -0700

+++ config.guess	2016-09-15 15:57:52.672455013 -0600

@@ -1,13 +1,12 @@

 #! /bin/sh

 # Attempt to guess a canonical system name.

-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001

-#   Free Software Foundation, Inc.

+#   Copyright 1992-2016 Free Software Foundation, Inc.

-timestamp='2001-09-04'

+timestamp='2016-09-11'

 # This file is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2 of the License, or

+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.

 #

 # This program is distributed in the hope that it will be useful, but

@@ -16,23 +15,22 @@ timestamp='2001-09-04'

 # General Public License for more details.

 #

 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+# along with this program; if not, see <http://www.gnu.org/licenses/>.

 #

 # As a special exception to the GNU General Public License, if you

 # distribute this file as part of a program that contains a

 # configuration script generated by Autoconf, you may include it under

-# the same distribution terms that you use for the rest of that program.

-

-# Written by Per Bothner <bothner@cygnus.com>.

-# Please send patches to <config-patches@gnu.org>.

+# the same distribution terms that you use for the rest of that

+# program.  This Exception is an additional permission under section 7

+# of the GNU General Public License, version 3 ("GPLv3").

 #

-# This script attempts to guess a canonical system name similar to

-# config.sub.  If it succeeds, it prints the system name on stdout, and

-# exits with 0.  Otherwise, it exits with 1.

+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.

 #

-# The plan is that this can be called by configure scripts if you

-# don't specify an explicit build system type.

+# You can get the latest version of this script from:

+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess

+#

+# Please send patches to <config-patches@gnu.org>.

+

 me=`echo "$0" | sed -e 's,.*/,,'`

@@ -52,8 +50,7 @@ version="\

 GNU config.guess ($timestamp)

 Originally written by Per Bothner.

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001

-Free Software Foundation, Inc.

+Copyright 1992-2016 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO

 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

@@ -65,11 +62,11 @@ Try \`$me --help' for more information."

 while test $# -gt 0 ; do

   case $1 in

     --time-stamp | --time* | -t )

-       echo "$timestamp" ; exit 0 ;;

+       echo "$timestamp" ; exit ;;

     --version | -v )

-       echo "$version" ; exit 0 ;;

+       echo "$version" ; exit ;;

     --help | --h* | -h )

-       echo "$usage"; exit 0 ;;

+       echo "$usage"; exit ;;

     -- )     # Stop option processing

        shift; break ;;

     - )	# Use stdin as input.

@@ -87,30 +84,42 @@ if test $# != 0; then

   exit 1

 fi

+trap 'exit 1' 1 2 15

-dummy=dummy-$$

-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15

+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a

+# compiler to aid in system detection is discouraged as it requires

+# temporary files to be created and, as you can see below, it is a

+# headache to deal with in a portable fashion.

-# CC_FOR_BUILD -- compiler used by this script.

 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still

 # use `HOST_CC' if defined, but it is deprecated.

-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in

- ,,)    echo "int dummy(){}" > $dummy.c ;

-	for c in cc gcc c89 ; do

-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;

-	  if test $? = 0 ; then

+# Portable tmp directory creation inspired by the Autoconf team.

+

+set_cc_for_build='

+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;

+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;

+: ${TMPDIR=/tmp} ;

+ { 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) ; } ||

+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||

+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;

+dummy=$tmp/dummy ;

+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;

+case $CC_FOR_BUILD,$HOST_CC,$CC in

+ ,,)    echo "int x;" > $dummy.c ;

+	for c in cc gcc c89 c99 ; do

+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then

 	     CC_FOR_BUILD="$c"; break ;

 	  fi ;

 	done ;

-	rm -f $dummy.c $dummy.o $dummy.rel ;

 	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'

+esac ; set_cc_for_build= ;'

 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.

 # (ghazi@noc.rutgers.edu 1994-08-24)

@@ -123,36 +132,69 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |

 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown

 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

+

+	eval $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'`

+	;;

+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 tupples: *-*-netbsdelf*, *-*-netbsdaout*,

+	# 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.

-	# Determine the machine/vendor (is the vendor relevant).

-	case "${UNAME_MACHINE}" in

-	    amiga) machine=m68k-unknown ;;

-	    arm32) machine=arm-unknown ;;

-	    atari*) machine=m68k-atari ;;

-	    sun3*) machine=m68k-sun ;;

-	    mac68k) machine=m68k-apple ;;

-	    macppc) machine=powerpc-apple ;;

-	    hp3[0-9][05]) machine=m68k-hp ;;

-	    ibmrt|romp-ibm) machine=romp-ibm ;;

-	    *) machine=${UNAME_MACHINE}-unknown ;;

+	#

+	# 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.

-	case "${UNAME_MACHINE}" in

-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)

+	# to ELF recently (or will in the future) and ABI.

+	case "${UNAME_MACHINE_ARCH}" in

+	    earm*)

+		os=netbsdelf

+		;;

+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)

 		eval $set_cc_for_build

 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \

-			| grep __ELF__ >/dev/null

+			| grep -q __ELF__

 		then

 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).

 		    # Return netbsd for either.  FIX?

@@ -162,124 +204,153 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

 		fi

 		;;

 	    *)

-	        os=netbsd

+		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

-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`

+	# 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}"

-	exit 0 ;;

+	echo "${machine}-${os}${release}${abi}"

+	exit ;;

+    *:Bitrig:*:*)

+	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 ;;

+    *:LibertyBSD:*:*)

+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`

+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}

+	exit ;;

+    *:ekkoBSD:*:*)

+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}

+	exit ;;

+    *:SolidBSD:*:*)

+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}

+	exit ;;

+    macppc:MirBSD:*:*)

+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}

+	exit ;;

+    *:MirBSD:*:*)

+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}

+	exit ;;

+    *:Sortix:*:*)

+	echo ${UNAME_MACHINE}-unknown-sortix

+	exit ;;

     alpha:OSF1:*:*)

-	if test $UNAME_RELEASE = "V4.0"; then

+	case $UNAME_RELEASE in

+	*4.0)

 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`

-	fi

+		;;

+	*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.

-	cat <<EOF >$dummy.s

-	.data

-\$Lformat:

-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"

-

-	.text

-	.globl main

-	.align 4

-	.ent main

-main:

-	.frame \$30,16,\$26,0

-	ldgp \$29,0(\$27)

-	.prologue 1

-	.long 0x47e03d80 # implver \$0

-	lda \$2,-1

-	.long 0x47e20c21 # amask \$2,\$1

-	lda \$16,\$Lformat

-	mov \$0,\$17

-	not \$1,\$18

-	jsr \$26,printf

-	ldgp \$29,0(\$26)

-	mov 0,\$16

-	jsr \$26,exit

-	.end main

-EOF

-	eval $set_cc_for_build

-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null

-	if test "$?" = 0 ; then

-		case `./$dummy` in

-			0-0)

-				UNAME_MACHINE="alpha"

-				;;

-			1-0)

-				UNAME_MACHINE="alphaev5"

-				;;

-			1-1)

-				UNAME_MACHINE="alphaev56"

-				;;

-			1-101)

-				UNAME_MACHINE="alphapca56"

-				;;

-			2-303)

-				UNAME_MACHINE="alphaev6"

-				;;

-			2-307)

-				UNAME_MACHINE="alphaev67"

-				;;

-			2-1307)

-				UNAME_MACHINE="alphaev68"

-				;;

-		esac

-	fi

-	rm -f $dummy.s $dummy

-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

-	exit 0 ;;

+	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 ;;

     Alpha\ *:Windows_NT*:*)

 	# How do we know it's Interix rather than the generic POSIX subsystem?

 	# Should we change UNAME_MACHINE based on the output of uname instead

 	# of the specific Alpha model?

 	echo alpha-pc-interix

-	exit 0 ;;

+	exit ;;

     21064:Windows_NT:50:3)

 	echo alpha-dec-winnt3.5

-	exit 0 ;;

+	exit ;;

     Amiga*:UNIX_System_V:4.0:*)

 	echo m68k-unknown-sysv4

-	exit 0;;

-    amiga:OpenBSD:*:*)

-	echo m68k-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

+	exit ;;

     *:[Aa]miga[Oo][Ss]:*:*)

 	echo ${UNAME_MACHINE}-unknown-amigaos

-	exit 0 ;;

-    arc64:OpenBSD:*:*)

-	echo mips64el-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

-    arc:OpenBSD:*:*)

-	echo mipsel-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

-    hkmips:OpenBSD:*:*)

-	echo mips-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

-    pmax:OpenBSD:*:*)

-	echo mipsel-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

-    sgi:OpenBSD:*:*)

-	echo mips-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

-    wgrisc:OpenBSD:*:*)

-	echo mipsel-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

+	exit ;;

+    *:[Mm]orph[Oo][Ss]:*:*)

+	echo ${UNAME_MACHINE}-unknown-morphos

+	exit ;;

     *:OS/390:*:*)

 	echo i370-ibm-openedition

-	exit 0 ;;

+	exit ;;

+    *:z/VM:*:*)

+	echo s390-ibm-zvmoe

+	exit ;;

+    *:OS400:*:*)

+	echo powerpc-ibm-os400

+	exit ;;

     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)

 	echo arm-acorn-riscix${UNAME_RELEASE}

-	exit 0;;

+	exit ;;

+    arm*:riscos:*:*|arm*:RISCOS:*:*)

+	echo arm-unknown-riscos

+	exit ;;

     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)

 	echo hppa1.1-hitachi-hiuxmpp

-	exit 0;;

+	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

@@ -287,25 +358,51 @@ EOF

 	else

 		echo pyramid-pyramid-bsd

 	fi

-	exit 0 ;;

+	exit ;;

     NILE*:*:*:dcosx)

 	echo pyramid-pyramid-svr4

-	exit 0 ;;

+	exit ;;

+    DRS?6000:unix:4.0:6*)

+	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 ;;

+    s390x:SunOS:*:*)

+	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 0 ;;

+	exit ;;

     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)

 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

-	exit 0 ;;

-    i86pc:SunOS:5.*:*)

-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

-	exit 0 ;;

+	exit ;;

+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)

+	echo i386-pc-auroraux${UNAME_RELEASE}

+	exit ;;

+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)

+	eval $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 0 ;;

+	exit ;;

     sun4*:SunOS:*:*)

 	case "`/usr/bin/arch -k`" in

 	    Series*|S4*)

@@ -314,13 +411,13 @@ EOF

 	esac

 	# Japanese Language versions have a version number like `4.1.3-JL'.

 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`

-	exit 0 ;;

+	exit ;;

     sun3*:SunOS:*:*)

 	echo m68k-sun-sunos${UNAME_RELEASE}

-	exit 0 ;;

+	exit ;;

     sun*:*:4.2BSD:*)

-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`

-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3

+	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}

@@ -329,16 +426,10 @@ EOF

 		echo sparc-sun-sunos${UNAME_RELEASE}

 		;;

 	esac

-	exit 0 ;;

+	exit ;;

     aushp:SunOS:*:*)

 	echo sparc-auspex-sunos${UNAME_RELEASE}

-	exit 0 ;;

-    sparc*:NetBSD:*)

-	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}

-	exit 0 ;;

-    atari*:OpenBSD:*:*)

-	echo m68k-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

+	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

@@ -348,50 +439,41 @@ EOF

     # 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 0 ;;

+	echo m68k-atari-mint${UNAME_RELEASE}

+	exit ;;

     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)

 	echo m68k-atari-mint${UNAME_RELEASE}

-        exit 0 ;;

+	exit ;;

     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)

-        echo m68k-atari-mint${UNAME_RELEASE}

-	exit 0 ;;

+	echo m68k-atari-mint${UNAME_RELEASE}

+	exit ;;

     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)

-        echo m68k-milan-mint${UNAME_RELEASE}

-        exit 0 ;;

+	echo m68k-milan-mint${UNAME_RELEASE}

+	exit ;;

     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)

-        echo m68k-hades-mint${UNAME_RELEASE}

-        exit 0 ;;

+	echo m68k-hades-mint${UNAME_RELEASE}

+	exit ;;

     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)

-        echo m68k-unknown-mint${UNAME_RELEASE}

-        exit 0 ;;

-    sun3*:OpenBSD:*:*)

-	echo m68k-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

-    mac68k:OpenBSD:*:*)

-	echo m68k-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

-    mvme68k:OpenBSD:*:*)

-	echo m68k-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

-    mvme88k:OpenBSD:*:*)

-	echo m88k-unknown-openbsd${UNAME_RELEASE}

-	exit 0 ;;

+	echo m68k-unknown-mint${UNAME_RELEASE}

+	exit ;;

+    m68k:machten:*:*)

+	echo m68k-apple-machten${UNAME_RELEASE}

+	exit ;;

     powerpc:machten:*:*)

 	echo powerpc-apple-machten${UNAME_RELEASE}

-	exit 0 ;;

+	exit ;;

     RISC*:Mach:*:*)

 	echo mips-dec-mach_bsd4.3

-	exit 0 ;;

+	exit ;;

     RISC*:ULTRIX:*:*)

 	echo mips-dec-ultrix${UNAME_RELEASE}

-	exit 0 ;;

+	exit ;;

     VAX*:ULTRIX*:*:*)

 	echo vax-dec-ultrix${UNAME_RELEASE}

-	exit 0 ;;

+	exit ;;

     2020:CLIX:*:* | 2430:CLIX:*:*)

 	echo clipper-intergraph-clix${UNAME_RELEASE}

-	exit 0 ;;

+	exit ;;

     mips:*:*:UMIPS | mips:*:*:RISCos)

 	eval $set_cc_for_build

 	sed 's/^	//' << EOF >$dummy.c

@@ -415,30 +497,36 @@ EOF

 	  exit (-1);

 	}

 EOF

-	$CC_FOR_BUILD $dummy.c -o $dummy \

-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \

-	  && rm -f $dummy.c $dummy && exit 0

-	rm -f $dummy.c $dummy

+	$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 0 ;;

+	exit ;;

     Motorola:PowerMAX_OS:*:*)

 	echo powerpc-motorola-powermax

-	exit 0 ;;

+	exit ;;

+    Motorola:*:4.3:PL8-*)

+	echo powerpc-harris-powermax

+	exit ;;

+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)

+	echo powerpc-harris-powermax

+	exit ;;

     Night_Hawk:Power_UNIX:*:*)

 	echo powerpc-harris-powerunix

-	exit 0 ;;

+	exit ;;

     m88k:CX/UX:7*:*)

 	echo m88k-harris-cxux7

-	exit 0 ;;

+	exit ;;

     m88k:*:4*:R4*)

 	echo m88k-motorola-sysv4

-	exit 0 ;;

+	exit ;;

     m88k:*:3*:R3*)

 	echo m88k-motorola-sysv3

-	exit 0 ;;

+	exit ;;

     AViiON:dgux:*:*)

-        # DG/UX returns AViiON for all architectures

-        UNAME_PROCESSOR=`/usr/bin/uname -p`

+	# 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 ] || \

@@ -451,29 +539,29 @@ EOF

 	else

 	    echo i586-dg-dgux${UNAME_RELEASE}

 	fi

- 	exit 0 ;;

+	exit ;;

     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)

 	echo m88k-dolphin-sysv3

-	exit 0 ;;

+	exit ;;

     M88*:*:R3*:*)

 	# Delta 88k system running SVR3

 	echo m88k-motorola-sysv3

-	exit 0 ;;

+	exit ;;

     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)

 	echo m88k-tektronix-sysv3

-	exit 0 ;;

+	exit ;;

     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)

 	echo m68k-tektronix-bsd

-	exit 0 ;;

+	exit ;;

     *:IRIX*:*:*)

 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`

-	exit 0 ;;

+	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 0 ;;              # 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 0 ;;

+	exit ;;

     ia64:AIX:*:*)

 	if [ -x /usr/bin/oslevel ] ; then

 		IBM_REV=`/usr/bin/oslevel`

@@ -481,7 +569,7 @@ EOF

 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}

 	fi

 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}

-	exit 0 ;;

+	exit ;;

     *:AIX:2:3)

 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then

 		eval $set_cc_for_build

@@ -496,118 +584,140 @@ EOF

 			exit(0);

 			}

 EOF

-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0

-		rm -f $dummy.c $dummy

-		echo rs6000-ibm-aix3.2.5

+		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 0 ;;

-    *:AIX:*:[45])

-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`

+	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/oslevel ] ; then

-		IBM_REV=`/usr/bin/oslevel`

+	if [ -x /usr/bin/lslpp ] ; then

+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |

+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`

 	else

 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}

 	fi

 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}

-	exit 0 ;;

+	exit ;;

     *:AIX:*:*)

 	echo rs6000-ibm-aix

-	exit 0 ;;

+	exit ;;

     ibmrt:4.4BSD:*|romp-ibm:BSD:*)

 	echo romp-ibm-bsd4.4

-	exit 0 ;;

+	exit ;;

     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and

 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to

-	exit 0 ;;                           # report: romp-ibm BSD 4.3

+	exit ;;                             # report: romp-ibm BSD 4.3

     *:BOSX:*:*)

 	echo rs6000-bull-bosx

-	exit 0 ;;

+	exit ;;

     DPX/2?00:B.O.S.:*:*)

 	echo m68k-bull-sysv3

-	exit 0 ;;

+	exit ;;

     9000/[34]??:4.3bsd:1.*:*)

 	echo m68k-hp-bsd

-	exit 0 ;;

+	exit ;;

     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)

 	echo m68k-hp-bsd4.4

-	exit 0 ;;

+	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])

-              case "${HPUX_REV}" in

-                11.[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" ;;

-                        esac ;;

-                    esac

-                  fi ;;

-              esac

-              if [ "${HP_ARCH}" = "" ]; then

-	      eval $set_cc_for_build

-              sed 's/^              //' << EOF >$dummy.c

+		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

+		    eval $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)