config.guess
changeset 182 be2f2fcde889
parent 112 18ef1756e699
child 192 cee9f4af8db0
     1.1 --- a/config.guess	Fri Dec 28 16:43:56 2007 +0000
     1.2 +++ b/config.guess	Thu Jan 03 06:08:23 2008 +0000
     1.3 @@ -1,9 +1,10 @@
     1.4  #! /bin/sh
     1.5  # Attempt to guess a canonical system name.
     1.6  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     1.7 -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
     1.8 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
     1.9 +#   Inc.
    1.10  
    1.11 -timestamp='2003-02-22'
    1.12 +timestamp='2007-12-12'
    1.13  
    1.14  # This file is free software; you can redistribute it and/or modify it
    1.15  # under the terms of the GNU General Public License as published by
    1.16 @@ -17,13 +18,15 @@
    1.17  #
    1.18  # You should have received a copy of the GNU General Public License
    1.19  # along with this program; if not, write to the Free Software
    1.20 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    1.21 +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    1.22 +# 02110-1301, USA.
    1.23  #
    1.24  # As a special exception to the GNU General Public License, if you
    1.25  # distribute this file as part of a program that contains a
    1.26  # configuration script generated by Autoconf, you may include it under
    1.27  # the same distribution terms that you use for the rest of that program.
    1.28  
    1.29 +
    1.30  # Originally written by Per Bothner <per@bothner.com>.
    1.31  # Please send patches to <config-patches@gnu.org>.  Submit a context
    1.32  # diff and a properly formatted ChangeLog entry.
    1.33 @@ -53,7 +56,7 @@
    1.34  GNU config.guess ($timestamp)
    1.35  
    1.36  Originally written by Per Bothner.
    1.37 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
    1.38 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    1.39  Free Software Foundation, Inc.
    1.40  
    1.41  This is free software; see the source for copying conditions.  There is NO
    1.42 @@ -66,11 +69,11 @@
    1.43  while test $# -gt 0 ; do
    1.44    case $1 in
    1.45      --time-stamp | --time* | -t )
    1.46 -       echo "$timestamp" ; exit 0 ;;
    1.47 +       echo "$timestamp" ; exit ;;
    1.48      --version | -v )
    1.49 -       echo "$version" ; exit 0 ;;
    1.50 +       echo "$version" ; exit ;;
    1.51      --help | --h* | -h )
    1.52 -       echo "$usage"; exit 0 ;;
    1.53 +       echo "$usage"; exit ;;
    1.54      -- )     # Stop option processing
    1.55         shift; break ;;
    1.56      - )	# Use stdin as input.
    1.57 @@ -104,8 +107,9 @@
    1.58  trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
    1.59  trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
    1.60  : ${TMPDIR=/tmp} ;
    1.61 - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
    1.62 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
    1.63   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
    1.64 + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
    1.65   { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
    1.66  dummy=$tmp/dummy ;
    1.67  tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
    1.68 @@ -122,7 +126,7 @@
    1.69  	;;
    1.70   ,,*)   CC_FOR_BUILD=$CC ;;
    1.71   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
    1.72 -esac ;'
    1.73 +esac ; set_cc_for_build= ;'
    1.74  
    1.75  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
    1.76  # (ghazi@noc.rutgers.edu 1994-08-24)
    1.77 @@ -157,6 +161,7 @@
    1.78  	    arm*) machine=arm-unknown ;;
    1.79  	    sh3el) machine=shl-unknown ;;
    1.80  	    sh3eb) machine=sh-unknown ;;
    1.81 +	    sh5el) machine=sh5le-unknown ;;
    1.82  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
    1.83  	esac
    1.84  	# The Operating System including object format, if it has switched
    1.85 @@ -195,50 +200,32 @@
    1.86  	# contains redundant information, the shorter form:
    1.87  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
    1.88  	echo "${machine}-${os}${release}"
    1.89 -	exit 0 ;;
    1.90 -    amiga:OpenBSD:*:*)
    1.91 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
    1.92 -	exit 0 ;;
    1.93 -    arc:OpenBSD:*:*)
    1.94 -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
    1.95 -	exit 0 ;;
    1.96 -    hp300:OpenBSD:*:*)
    1.97 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
    1.98 -	exit 0 ;;
    1.99 -    mac68k:OpenBSD:*:*)
   1.100 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
   1.101 -	exit 0 ;;
   1.102 -    macppc:OpenBSD:*:*)
   1.103 -	echo powerpc-unknown-openbsd${UNAME_RELEASE}
   1.104 -	exit 0 ;;
   1.105 -    mvme68k:OpenBSD:*:*)
   1.106 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
   1.107 -	exit 0 ;;
   1.108 -    mvme88k:OpenBSD:*:*)
   1.109 -	echo m88k-unknown-openbsd${UNAME_RELEASE}
   1.110 -	exit 0 ;;
   1.111 -    mvmeppc:OpenBSD:*:*)
   1.112 -	echo powerpc-unknown-openbsd${UNAME_RELEASE}
   1.113 -	exit 0 ;;
   1.114 -    pmax:OpenBSD:*:*)
   1.115 -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
   1.116 -	exit 0 ;;
   1.117 -    sgi:OpenBSD:*:*)
   1.118 -	echo mipseb-unknown-openbsd${UNAME_RELEASE}
   1.119 -	exit 0 ;;
   1.120 -    sun3:OpenBSD:*:*)
   1.121 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
   1.122 -	exit 0 ;;
   1.123 -    wgrisc:OpenBSD:*:*)
   1.124 -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
   1.125 -	exit 0 ;;
   1.126 +	exit ;;
   1.127      *:OpenBSD:*:*)
   1.128 -	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
   1.129 -	exit 0 ;;
   1.130 +	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
   1.131 +	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
   1.132 +	exit ;;
   1.133 +    *:ekkoBSD:*:*)
   1.134 +	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
   1.135 +	exit ;;
   1.136 +    *:SolidBSD:*:*)
   1.137 +	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
   1.138 +	exit ;;
   1.139 +    macppc:MirBSD:*:*)
   1.140 +	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
   1.141 +	exit ;;
   1.142 +    *:MirBSD:*:*)
   1.143 +	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
   1.144 +	exit ;;
   1.145      alpha:OSF1:*:*)
   1.146 -	if test $UNAME_RELEASE = "V4.0"; then
   1.147 +	case $UNAME_RELEASE in
   1.148 +	*4.0)
   1.149  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
   1.150 -	fi
   1.151 +		;;
   1.152 +	*5.*)
   1.153 +	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
   1.154 +		;;
   1.155 +	esac
   1.156  	# According to Compaq, /usr/sbin/psrinfo has been available on
   1.157  	# OSF/1 and Tru64 systems produced since 1995.  I hope that
   1.158  	# covers most systems running today.  This code pipes the CPU
   1.159 @@ -276,39 +263,49 @@
   1.160  	    "EV7.9 (21364A)")
   1.161  		UNAME_MACHINE="alphaev79" ;;
   1.162  	esac
   1.163 +	# A Pn.n version is a patched version.
   1.164  	# A Vn.n version is a released version.
   1.165  	# A Tn.n version is a released field test version.
   1.166  	# A Xn.n version is an unreleased experimental baselevel.
   1.167  	# 1.2 uses "1.2" for uname -r.
   1.168 -	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   1.169 -	exit 0 ;;
   1.170 +	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   1.171 +	exit ;;
   1.172      Alpha\ *:Windows_NT*:*)
   1.173  	# How do we know it's Interix rather than the generic POSIX subsystem?
   1.174  	# Should we change UNAME_MACHINE based on the output of uname instead
   1.175  	# of the specific Alpha model?
   1.176  	echo alpha-pc-interix
   1.177 -	exit 0 ;;
   1.178 +	exit ;;
   1.179      21064:Windows_NT:50:3)
   1.180  	echo alpha-dec-winnt3.5
   1.181 -	exit 0 ;;
   1.182 +	exit ;;
   1.183      Amiga*:UNIX_System_V:4.0:*)
   1.184  	echo m68k-unknown-sysv4
   1.185 -	exit 0;;
   1.186 +	exit ;;
   1.187      *:[Aa]miga[Oo][Ss]:*:*)
   1.188  	echo ${UNAME_MACHINE}-unknown-amigaos
   1.189 -	exit 0 ;;
   1.190 +	exit ;;
   1.191      *:[Mm]orph[Oo][Ss]:*:*)
   1.192  	echo ${UNAME_MACHINE}-unknown-morphos
   1.193 -	exit 0 ;;
   1.194 +	exit ;;
   1.195      *:OS/390:*:*)
   1.196  	echo i370-ibm-openedition
   1.197 -	exit 0 ;;
   1.198 +	exit ;;
   1.199 +    *:z/VM:*:*)
   1.200 +	echo s390-ibm-zvmoe
   1.201 +	exit ;;
   1.202 +    *:OS400:*:*)
   1.203 +        echo powerpc-ibm-os400
   1.204 +	exit ;;
   1.205      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   1.206  	echo arm-acorn-riscix${UNAME_RELEASE}
   1.207 -	exit 0;;
   1.208 +	exit ;;
   1.209 +    arm:riscos:*:*|arm:RISCOS:*:*)
   1.210 +	echo arm-unknown-riscos
   1.211 +	exit ;;
   1.212      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
   1.213  	echo hppa1.1-hitachi-hiuxmpp
   1.214 -	exit 0;;
   1.215 +	exit ;;
   1.216      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
   1.217  	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
   1.218  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
   1.219 @@ -316,29 +313,32 @@
   1.220  	else
   1.221  		echo pyramid-pyramid-bsd
   1.222  	fi
   1.223 -	exit 0 ;;
   1.224 +	exit ;;
   1.225      NILE*:*:*:dcosx)
   1.226  	echo pyramid-pyramid-svr4
   1.227 -	exit 0 ;;
   1.228 -    DRS?6000:UNIX_SV:4.2*:7*)
   1.229 +	exit ;;
   1.230 +    DRS?6000:unix:4.0:6*)
   1.231 +	echo sparc-icl-nx6
   1.232 +	exit ;;
   1.233 +    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
   1.234  	case `/usr/bin/uname -p` in
   1.235 -	    sparc) echo sparc-icl-nx7 && exit 0 ;;
   1.236 +	    sparc) echo sparc-icl-nx7; exit ;;
   1.237  	esac ;;
   1.238      sun4H:SunOS:5.*:*)
   1.239  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.240 -	exit 0 ;;
   1.241 +	exit ;;
   1.242      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
   1.243  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.244 -	exit 0 ;;
   1.245 -    i86pc:SunOS:5.*:*)
   1.246 +	exit ;;
   1.247 +    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
   1.248  	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.249 -	exit 0 ;;
   1.250 +	exit ;;
   1.251      sun4*:SunOS:6*:*)
   1.252  	# According to config.sub, this is the proper way to canonicalize
   1.253  	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
   1.254  	# it's likely to be more like Solaris than SunOS4.
   1.255  	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.256 -	exit 0 ;;
   1.257 +	exit ;;
   1.258      sun4*:SunOS:*:*)
   1.259  	case "`/usr/bin/arch -k`" in
   1.260  	    Series*|S4*)
   1.261 @@ -347,10 +347,10 @@
   1.262  	esac
   1.263  	# Japanese Language versions have a version number like `4.1.3-JL'.
   1.264  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
   1.265 -	exit 0 ;;
   1.266 +	exit ;;
   1.267      sun3*:SunOS:*:*)
   1.268  	echo m68k-sun-sunos${UNAME_RELEASE}
   1.269 -	exit 0 ;;
   1.270 +	exit ;;
   1.271      sun*:*:4.2BSD:*)
   1.272  	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
   1.273  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
   1.274 @@ -362,10 +362,10 @@
   1.275  		echo sparc-sun-sunos${UNAME_RELEASE}
   1.276  		;;
   1.277  	esac
   1.278 -	exit 0 ;;
   1.279 +	exit ;;
   1.280      aushp:SunOS:*:*)
   1.281  	echo sparc-auspex-sunos${UNAME_RELEASE}
   1.282 -	exit 0 ;;
   1.283 +	exit ;;
   1.284      # The situation for MiNT is a little confusing.  The machine name
   1.285      # can be virtually everything (everything which is not
   1.286      # "atarist" or "atariste" at least should have a processor
   1.287 @@ -376,37 +376,40 @@
   1.288      # be no problem.
   1.289      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
   1.290          echo m68k-atari-mint${UNAME_RELEASE}
   1.291 -	exit 0 ;;
   1.292 +	exit ;;
   1.293      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
   1.294  	echo m68k-atari-mint${UNAME_RELEASE}
   1.295 -        exit 0 ;;
   1.296 +        exit ;;
   1.297      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
   1.298          echo m68k-atari-mint${UNAME_RELEASE}
   1.299 -	exit 0 ;;
   1.300 +	exit ;;
   1.301      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
   1.302          echo m68k-milan-mint${UNAME_RELEASE}
   1.303 -        exit 0 ;;
   1.304 +        exit ;;
   1.305      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
   1.306          echo m68k-hades-mint${UNAME_RELEASE}
   1.307 -        exit 0 ;;
   1.308 +        exit ;;
   1.309      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
   1.310          echo m68k-unknown-mint${UNAME_RELEASE}
   1.311 -        exit 0 ;;
   1.312 +        exit ;;
   1.313 +    m68k:machten:*:*)
   1.314 +	echo m68k-apple-machten${UNAME_RELEASE}
   1.315 +	exit ;;
   1.316      powerpc:machten:*:*)
   1.317  	echo powerpc-apple-machten${UNAME_RELEASE}
   1.318 -	exit 0 ;;
   1.319 +	exit ;;
   1.320      RISC*:Mach:*:*)
   1.321  	echo mips-dec-mach_bsd4.3
   1.322 -	exit 0 ;;
   1.323 +	exit ;;
   1.324      RISC*:ULTRIX:*:*)
   1.325  	echo mips-dec-ultrix${UNAME_RELEASE}
   1.326 -	exit 0 ;;
   1.327 +	exit ;;
   1.328      VAX*:ULTRIX*:*:*)
   1.329  	echo vax-dec-ultrix${UNAME_RELEASE}
   1.330 -	exit 0 ;;
   1.331 +	exit ;;
   1.332      2020:CLIX:*:* | 2430:CLIX:*:*)
   1.333  	echo clipper-intergraph-clix${UNAME_RELEASE}
   1.334 -	exit 0 ;;
   1.335 +	exit ;;
   1.336      mips:*:*:UMIPS | mips:*:*:RISCos)
   1.337  	eval $set_cc_for_build
   1.338  	sed 's/^	//' << EOF >$dummy.c
   1.339 @@ -430,32 +433,33 @@
   1.340  	  exit (-1);
   1.341  	}
   1.342  EOF
   1.343 -	$CC_FOR_BUILD -o $dummy $dummy.c \
   1.344 -	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
   1.345 -	  && exit 0
   1.346 +	$CC_FOR_BUILD -o $dummy $dummy.c &&
   1.347 +	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
   1.348 +	  SYSTEM_NAME=`$dummy $dummyarg` &&
   1.349 +	    { echo "$SYSTEM_NAME"; exit; }
   1.350  	echo mips-mips-riscos${UNAME_RELEASE}
   1.351 -	exit 0 ;;
   1.352 +	exit ;;
   1.353      Motorola:PowerMAX_OS:*:*)
   1.354  	echo powerpc-motorola-powermax
   1.355 -	exit 0 ;;
   1.356 +	exit ;;
   1.357      Motorola:*:4.3:PL8-*)
   1.358  	echo powerpc-harris-powermax
   1.359 -	exit 0 ;;
   1.360 +	exit ;;
   1.361      Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
   1.362  	echo powerpc-harris-powermax
   1.363 -	exit 0 ;;
   1.364 +	exit ;;
   1.365      Night_Hawk:Power_UNIX:*:*)
   1.366  	echo powerpc-harris-powerunix
   1.367 -	exit 0 ;;
   1.368 +	exit ;;
   1.369      m88k:CX/UX:7*:*)
   1.370  	echo m88k-harris-cxux7
   1.371 -	exit 0 ;;
   1.372 +	exit ;;
   1.373      m88k:*:4*:R4*)
   1.374  	echo m88k-motorola-sysv4
   1.375 -	exit 0 ;;
   1.376 +	exit ;;
   1.377      m88k:*:3*:R3*)
   1.378  	echo m88k-motorola-sysv3
   1.379 -	exit 0 ;;
   1.380 +	exit ;;
   1.381      AViiON:dgux:*:*)
   1.382          # DG/UX returns AViiON for all architectures
   1.383          UNAME_PROCESSOR=`/usr/bin/uname -p`
   1.384 @@ -471,29 +475,29 @@
   1.385  	else
   1.386  	    echo i586-dg-dgux${UNAME_RELEASE}
   1.387  	fi
   1.388 - 	exit 0 ;;
   1.389 + 	exit ;;
   1.390      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
   1.391  	echo m88k-dolphin-sysv3
   1.392 -	exit 0 ;;
   1.393 +	exit ;;
   1.394      M88*:*:R3*:*)
   1.395  	# Delta 88k system running SVR3
   1.396  	echo m88k-motorola-sysv3
   1.397 -	exit 0 ;;
   1.398 +	exit ;;
   1.399      XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
   1.400  	echo m88k-tektronix-sysv3
   1.401 -	exit 0 ;;
   1.402 +	exit ;;
   1.403      Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
   1.404  	echo m68k-tektronix-bsd
   1.405 -	exit 0 ;;
   1.406 +	exit ;;
   1.407      *:IRIX*:*:*)
   1.408  	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
   1.409 -	exit 0 ;;
   1.410 +	exit ;;
   1.411      ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
   1.412 -	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
   1.413 -	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
   1.414 +	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
   1.415 +	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
   1.416      i*86:AIX:*:*)
   1.417  	echo i386-ibm-aix
   1.418 -	exit 0 ;;
   1.419 +	exit ;;
   1.420      ia64:AIX:*:*)
   1.421  	if [ -x /usr/bin/oslevel ] ; then
   1.422  		IBM_REV=`/usr/bin/oslevel`
   1.423 @@ -501,7 +505,7 @@
   1.424  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
   1.425  	fi
   1.426  	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
   1.427 -	exit 0 ;;
   1.428 +	exit ;;
   1.429      *:AIX:2:3)
   1.430  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
   1.431  		eval $set_cc_for_build
   1.432 @@ -516,14 +520,18 @@
   1.433  			exit(0);
   1.434  			}
   1.435  EOF
   1.436 -		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
   1.437 -		echo rs6000-ibm-aix3.2.5
   1.438 +		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
   1.439 +		then
   1.440 +			echo "$SYSTEM_NAME"
   1.441 +		else
   1.442 +			echo rs6000-ibm-aix3.2.5
   1.443 +		fi
   1.444  	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
   1.445  		echo rs6000-ibm-aix3.2.4
   1.446  	else
   1.447  		echo rs6000-ibm-aix3.2
   1.448  	fi
   1.449 -	exit 0 ;;
   1.450 +	exit ;;
   1.451      *:AIX:*:[45])
   1.452  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
   1.453  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
   1.454 @@ -537,28 +545,28 @@
   1.455  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
   1.456  	fi
   1.457  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
   1.458 -	exit 0 ;;
   1.459 +	exit ;;
   1.460      *:AIX:*:*)
   1.461  	echo rs6000-ibm-aix
   1.462 -	exit 0 ;;
   1.463 +	exit ;;
   1.464      ibmrt:4.4BSD:*|romp-ibm:BSD:*)
   1.465  	echo romp-ibm-bsd4.4
   1.466 -	exit 0 ;;
   1.467 +	exit ;;
   1.468      ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
   1.469  	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
   1.470 -	exit 0 ;;                           # report: romp-ibm BSD 4.3
   1.471 +	exit ;;                             # report: romp-ibm BSD 4.3
   1.472      *:BOSX:*:*)
   1.473  	echo rs6000-bull-bosx
   1.474 -	exit 0 ;;
   1.475 +	exit ;;
   1.476      DPX/2?00:B.O.S.:*:*)
   1.477  	echo m68k-bull-sysv3
   1.478 -	exit 0 ;;
   1.479 +	exit ;;
   1.480      9000/[34]??:4.3bsd:1.*:*)
   1.481  	echo m68k-hp-bsd
   1.482 -	exit 0 ;;
   1.483 +	exit ;;
   1.484      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
   1.485  	echo m68k-hp-bsd4.4
   1.486 -	exit 0 ;;
   1.487 +	exit ;;
   1.488      9000/[34678]??:HP-UX:*:*)
   1.489  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   1.490  	case "${UNAME_MACHINE}" in
   1.491 @@ -620,9 +628,19 @@
   1.492  	esac
   1.493  	if [ ${HP_ARCH} = "hppa2.0w" ]
   1.494  	then
   1.495 -	    # avoid double evaluation of $set_cc_for_build
   1.496 -	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
   1.497 -	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
   1.498 +	    eval $set_cc_for_build
   1.499 +
   1.500 +	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
   1.501 +	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
   1.502 +	    # generating 64-bit code.  GNU and HP use different nomenclature:
   1.503 +	    #
   1.504 +	    # $ CC_FOR_BUILD=cc ./config.guess
   1.505 +	    # => hppa2.0w-hp-hpux11.23
   1.506 +	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
   1.507 +	    # => hppa64-hp-hpux11.23
   1.508 +
   1.509 +	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
   1.510 +		grep __LP64__ >/dev/null
   1.511  	    then
   1.512  		HP_ARCH="hppa2.0w"
   1.513  	    else
   1.514 @@ -630,11 +648,11 @@
   1.515  	    fi
   1.516  	fi
   1.517  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
   1.518 -	exit 0 ;;
   1.519 +	exit ;;
   1.520      ia64:HP-UX:*:*)
   1.521  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   1.522  	echo ia64-hp-hpux${HPUX_REV}
   1.523 -	exit 0 ;;
   1.524 +	exit ;;
   1.525      3050*:HI-UX:*:*)
   1.526  	eval $set_cc_for_build
   1.527  	sed 's/^	//' << EOF >$dummy.c
   1.528 @@ -662,147 +680,192 @@
   1.529  	  exit (0);
   1.530  	}
   1.531  EOF
   1.532 -	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
   1.533 +	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
   1.534 +		{ echo "$SYSTEM_NAME"; exit; }
   1.535  	echo unknown-hitachi-hiuxwe2
   1.536 -	exit 0 ;;
   1.537 +	exit ;;
   1.538      9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
   1.539  	echo hppa1.1-hp-bsd
   1.540 -	exit 0 ;;
   1.541 +	exit ;;
   1.542      9000/8??:4.3bsd:*:*)
   1.543  	echo hppa1.0-hp-bsd
   1.544 -	exit 0 ;;
   1.545 +	exit ;;
   1.546      *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
   1.547  	echo hppa1.0-hp-mpeix
   1.548 -	exit 0 ;;
   1.549 +	exit ;;
   1.550      hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
   1.551  	echo hppa1.1-hp-osf
   1.552 -	exit 0 ;;
   1.553 +	exit ;;
   1.554      hp8??:OSF1:*:*)
   1.555  	echo hppa1.0-hp-osf
   1.556 -	exit 0 ;;
   1.557 +	exit ;;
   1.558      i*86:OSF1:*:*)
   1.559  	if [ -x /usr/sbin/sysversion ] ; then
   1.560  	    echo ${UNAME_MACHINE}-unknown-osf1mk
   1.561  	else
   1.562  	    echo ${UNAME_MACHINE}-unknown-osf1
   1.563  	fi
   1.564 -	exit 0 ;;
   1.565 +	exit ;;
   1.566      parisc*:Lites*:*:*)
   1.567  	echo hppa1.1-hp-lites
   1.568 -	exit 0 ;;
   1.569 +	exit ;;
   1.570      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
   1.571  	echo c1-convex-bsd
   1.572 -        exit 0 ;;
   1.573 +        exit ;;
   1.574      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
   1.575  	if getsysinfo -f scalar_acc
   1.576  	then echo c32-convex-bsd
   1.577  	else echo c2-convex-bsd
   1.578  	fi
   1.579 -        exit 0 ;;
   1.580 +        exit ;;
   1.581      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
   1.582  	echo c34-convex-bsd
   1.583 -        exit 0 ;;
   1.584 +        exit ;;
   1.585      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
   1.586  	echo c38-convex-bsd
   1.587 -        exit 0 ;;
   1.588 +        exit ;;
   1.589      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
   1.590  	echo c4-convex-bsd
   1.591 -        exit 0 ;;
   1.592 +        exit ;;
   1.593      CRAY*Y-MP:*:*:*)
   1.594  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.595 -	exit 0 ;;
   1.596 +	exit ;;
   1.597      CRAY*[A-Z]90:*:*:*)
   1.598  	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
   1.599  	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
   1.600  	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
   1.601  	      -e 's/\.[^.]*$/.X/'
   1.602 -	exit 0 ;;
   1.603 +	exit ;;
   1.604      CRAY*TS:*:*:*)
   1.605  	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.606 -	exit 0 ;;
   1.607 +	exit ;;
   1.608      CRAY*T3E:*:*:*)
   1.609  	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.610 -	exit 0 ;;
   1.611 +	exit ;;
   1.612      CRAY*SV1:*:*:*)
   1.613  	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.614 -	exit 0 ;;
   1.615 +	exit ;;
   1.616      *:UNICOS/mp:*:*)
   1.617 -	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
   1.618 -	exit 0 ;;
   1.619 +	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.620 +	exit ;;
   1.621      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
   1.622  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   1.623          FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.624          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
   1.625          echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.626 -        exit 0 ;;
   1.627 +        exit ;;
   1.628 +    5000:UNIX_System_V:4.*:*)
   1.629 +        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.630 +        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
   1.631 +        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.632 +	exit ;;
   1.633      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   1.634  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   1.635 -	exit 0 ;;
   1.636 +	exit ;;
   1.637      sparc*:BSD/OS:*:*)
   1.638  	echo sparc-unknown-bsdi${UNAME_RELEASE}
   1.639 -	exit 0 ;;
   1.640 +	exit ;;
   1.641      *:BSD/OS:*:*)
   1.642  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   1.643 -	exit 0 ;;
   1.644 +	exit ;;
   1.645      *:FreeBSD:*:*)
   1.646 -	# Determine whether the default compiler uses glibc.
   1.647 -	eval $set_cc_for_build
   1.648 -	sed 's/^	//' << EOF >$dummy.c
   1.649 -	#include <features.h>
   1.650 -	#if __GLIBC__ >= 2
   1.651 -	LIBC=gnu
   1.652 -	#else
   1.653 -	LIBC=
   1.654 -	#endif
   1.655 -EOF
   1.656 -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
   1.657 -	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
   1.658 -	exit 0 ;;
   1.659 +	case ${UNAME_MACHINE} in
   1.660 +	    pc98)
   1.661 +		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   1.662 +	    amd64)
   1.663 +		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   1.664 +	    *)
   1.665 +		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   1.666 +	esac
   1.667 +	exit ;;
   1.668      i*:CYGWIN*:*)
   1.669  	echo ${UNAME_MACHINE}-pc-cygwin
   1.670 -	exit 0 ;;
   1.671 -    i*:MINGW*:*)
   1.672 +	exit ;;
   1.673 +    *:MINGW*:*)
   1.674  	echo ${UNAME_MACHINE}-pc-mingw32
   1.675 -	exit 0 ;;
   1.676 +	exit ;;
   1.677 +    i*:windows32*:*)
   1.678 +    	# uname -m includes "-pc" on this system.
   1.679 +    	echo ${UNAME_MACHINE}-mingw32
   1.680 +	exit ;;
   1.681      i*:PW*:*)
   1.682  	echo ${UNAME_MACHINE}-pc-pw32
   1.683 -	exit 0 ;;
   1.684 -    x86:Interix*:3*)
   1.685 -	echo i586-pc-interix3
   1.686 -	exit 0 ;;
   1.687 +	exit ;;
   1.688 +    *:Interix*:[3456]*)
   1.689 +    	case ${UNAME_MACHINE} in
   1.690 +	    x86)
   1.691 +		echo i586-pc-interix${UNAME_RELEASE}
   1.692 +		exit ;;
   1.693 +	    EM64T | authenticamd)
   1.694 +		echo x86_64-unknown-interix${UNAME_RELEASE}
   1.695 +		exit ;;
   1.696 +	    IA64)
   1.697 +		echo ia64-unknown-interix${UNAME_RELEASE}
   1.698 +		exit ;;
   1.699 +	esac ;;
   1.700      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
   1.701  	echo i${UNAME_MACHINE}-pc-mks
   1.702 -	exit 0 ;;
   1.703 +	exit ;;
   1.704      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
   1.705  	# How do we know it's Interix rather than the generic POSIX subsystem?
   1.706  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
   1.707  	# UNAME_MACHINE based on the output of uname instead of i386?
   1.708  	echo i586-pc-interix
   1.709 -	exit 0 ;;
   1.710 +	exit ;;
   1.711      i*:UWIN*:*)
   1.712  	echo ${UNAME_MACHINE}-pc-uwin
   1.713 -	exit 0 ;;
   1.714 +	exit ;;
   1.715 +    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
   1.716 +	echo x86_64-unknown-cygwin
   1.717 +	exit ;;
   1.718      p*:CYGWIN*:*)
   1.719  	echo powerpcle-unknown-cygwin
   1.720 -	exit 0 ;;
   1.721 +	exit ;;
   1.722      prep*:SunOS:5.*:*)
   1.723  	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.724 -	exit 0 ;;
   1.725 +	exit ;;
   1.726      *:GNU:*:*)
   1.727 +	# the GNU system
   1.728  	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
   1.729 -	exit 0 ;;
   1.730 +	exit ;;
   1.731 +    *:GNU/*:*:*)
   1.732 +	# other systems with GNU libc and userland
   1.733 +	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
   1.734 +	exit ;;
   1.735      i*86:Minix:*:*)
   1.736  	echo ${UNAME_MACHINE}-pc-minix
   1.737 -	exit 0 ;;
   1.738 +	exit ;;
   1.739      arm*:Linux:*:*)
   1.740 +	eval $set_cc_for_build
   1.741 +	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
   1.742 +	    | grep -q __ARM_EABI__
   1.743 +	then
   1.744 +	    echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.745 +	else
   1.746 +	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
   1.747 +	fi
   1.748 +	exit ;;
   1.749 +    avr32*:Linux:*:*)
   1.750  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.751 -	exit 0 ;;
   1.752 +	exit ;;
   1.753 +    cris:Linux:*:*)
   1.754 +	echo cris-axis-linux-gnu
   1.755 +	exit ;;
   1.756 +    crisv32:Linux:*:*)
   1.757 +	echo crisv32-axis-linux-gnu
   1.758 +	exit ;;
   1.759 +    frv:Linux:*:*)
   1.760 +    	echo frv-unknown-linux-gnu
   1.761 +	exit ;;
   1.762      ia64:Linux:*:*)
   1.763  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.764 -	exit 0 ;;
   1.765 +	exit ;;
   1.766 +    m32r*:Linux:*:*)
   1.767 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.768 +	exit ;;
   1.769      m68*:Linux:*:*)
   1.770  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.771 -	exit 0 ;;
   1.772 +	exit ;;
   1.773      mips:Linux:*:*)
   1.774  	eval $set_cc_for_build
   1.775  	sed 's/^	//' << EOF >$dummy.c
   1.776 @@ -819,8 +882,12 @@
   1.777  	#endif
   1.778  	#endif
   1.779  EOF
   1.780 -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
   1.781 -	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
   1.782 +	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
   1.783 +	    /^CPU/{
   1.784 +		s: ::g
   1.785 +		p
   1.786 +	    }'`"
   1.787 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
   1.788  	;;
   1.789      mips64:Linux:*:*)
   1.790  	eval $set_cc_for_build
   1.791 @@ -838,15 +905,22 @@
   1.792  	#endif
   1.793  	#endif
   1.794  EOF
   1.795 -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
   1.796 -	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
   1.797 +	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
   1.798 +	    /^CPU/{
   1.799 +		s: ::g
   1.800 +		p
   1.801 +	    }'`"
   1.802 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
   1.803  	;;
   1.804 +    or32:Linux:*:*)
   1.805 +	echo or32-unknown-linux-gnu
   1.806 +	exit ;;
   1.807      ppc:Linux:*:*)
   1.808  	echo powerpc-unknown-linux-gnu
   1.809 -	exit 0 ;;
   1.810 +	exit ;;
   1.811      ppc64:Linux:*:*)
   1.812  	echo powerpc64-unknown-linux-gnu
   1.813 -	exit 0 ;;
   1.814 +	exit ;;
   1.815      alpha:Linux:*:*)
   1.816  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
   1.817  	  EV5)   UNAME_MACHINE=alphaev5 ;;
   1.818 @@ -860,7 +934,7 @@
   1.819  	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
   1.820  	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
   1.821  	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
   1.822 -	exit 0 ;;
   1.823 +	exit ;;
   1.824      parisc:Linux:*:* | hppa:Linux:*:*)
   1.825  	# Look for CPU level
   1.826  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
   1.827 @@ -868,22 +942,31 @@
   1.828  	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
   1.829  	  *)    echo hppa-unknown-linux-gnu ;;
   1.830  	esac
   1.831 -	exit 0 ;;
   1.832 +	exit ;;
   1.833      parisc64:Linux:*:* | hppa64:Linux:*:*)
   1.834  	echo hppa64-unknown-linux-gnu
   1.835 -	exit 0 ;;
   1.836 +	exit ;;
   1.837      s390:Linux:*:* | s390x:Linux:*:*)
   1.838  	echo ${UNAME_MACHINE}-ibm-linux
   1.839 -	exit 0 ;;
   1.840 +	exit ;;
   1.841 +    sh64*:Linux:*:*)
   1.842 +    	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.843 +	exit ;;
   1.844      sh*:Linux:*:*)
   1.845  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.846 -	exit 0 ;;
   1.847 +	exit ;;
   1.848      sparc:Linux:*:* | sparc64:Linux:*:*)
   1.849  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.850 -	exit 0 ;;
   1.851 +	exit ;;
   1.852 +    vax:Linux:*:*)
   1.853 +	echo ${UNAME_MACHINE}-dec-linux-gnu
   1.854 +	exit ;;
   1.855      x86_64:Linux:*:*)
   1.856  	echo x86_64-unknown-linux-gnu
   1.857 -	exit 0 ;;
   1.858 +	exit ;;
   1.859 +    xtensa*:Linux:*:*)
   1.860 +    	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.861 +	exit ;;
   1.862      i*86:Linux:*:*)
   1.863  	# The BFD linker knows what the default object file format is, so
   1.864  	# first see if it will tell us. cd to the root directory to prevent
   1.865 @@ -901,15 +984,15 @@
   1.866  		;;
   1.867  	  a.out-i386-linux)
   1.868  		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
   1.869 -		exit 0 ;;
   1.870 +		exit ;;
   1.871  	  coff-i386)
   1.872  		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
   1.873 -		exit 0 ;;
   1.874 +		exit ;;
   1.875  	  "")
   1.876  		# Either a pre-BFD a.out linker (linux-gnuoldld) or
   1.877  		# one that does not give us useful --help.
   1.878  		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
   1.879 -		exit 0 ;;
   1.880 +		exit ;;
   1.881  	esac
   1.882  	# Determine whether the default compiler is a.out or elf
   1.883  	eval $set_cc_for_build
   1.884 @@ -926,23 +1009,33 @@
   1.885  	LIBC=gnulibc1
   1.886  	# endif
   1.887  	#else
   1.888 -	#ifdef __INTEL_COMPILER
   1.889 +	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
   1.890  	LIBC=gnu
   1.891  	#else
   1.892  	LIBC=gnuaout
   1.893  	#endif
   1.894  	#endif
   1.895 +	#ifdef __dietlibc__
   1.896 +	LIBC=dietlibc
   1.897 +	#endif
   1.898  EOF
   1.899 -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
   1.900 -	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
   1.901 -	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
   1.902 +	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
   1.903 +	    /^LIBC/{
   1.904 +		s: ::g
   1.905 +		p
   1.906 +	    }'`"
   1.907 +	test x"${LIBC}" != x && {
   1.908 +		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
   1.909 +		exit
   1.910 +	}
   1.911 +	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
   1.912  	;;
   1.913      i*86:DYNIX/ptx:4*:*)
   1.914  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
   1.915  	# earlier versions are messed up and put the nodename in both
   1.916  	# sysname and nodename.
   1.917  	echo i386-sequent-sysv4
   1.918 -	exit 0 ;;
   1.919 +	exit ;;
   1.920      i*86:UNIX_SV:4.2MP:2.*)
   1.921          # Unixware is an offshoot of SVR4, but it has its own version
   1.922          # number series starting with 2...
   1.923 @@ -950,24 +1043,27 @@
   1.924  	# I just have to hope.  -- rms.
   1.925          # Use sysv4.2uw... so that sysv4* matches it.
   1.926  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
   1.927 -	exit 0 ;;
   1.928 +	exit ;;
   1.929      i*86:OS/2:*:*)
   1.930  	# If we were able to find `uname', then EMX Unix compatibility
   1.931  	# is probably installed.
   1.932  	echo ${UNAME_MACHINE}-pc-os2-emx
   1.933 -	exit 0 ;;
   1.934 +	exit ;;
   1.935      i*86:XTS-300:*:STOP)
   1.936  	echo ${UNAME_MACHINE}-unknown-stop
   1.937 -	exit 0 ;;
   1.938 +	exit ;;
   1.939      i*86:atheos:*:*)
   1.940  	echo ${UNAME_MACHINE}-unknown-atheos
   1.941 -	exit 0 ;;
   1.942 +	exit ;;
   1.943 +    i*86:syllable:*:*)
   1.944 +	echo ${UNAME_MACHINE}-pc-syllable
   1.945 +	exit ;;
   1.946      i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
   1.947  	echo i386-unknown-lynxos${UNAME_RELEASE}
   1.948 -	exit 0 ;;
   1.949 +	exit ;;
   1.950      i*86:*DOS:*:*)
   1.951  	echo ${UNAME_MACHINE}-pc-msdosdjgpp
   1.952 -	exit 0 ;;
   1.953 +	exit ;;
   1.954      i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
   1.955  	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
   1.956  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
   1.957 @@ -975,15 +1071,16 @@
   1.958  	else
   1.959  		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
   1.960  	fi
   1.961 -	exit 0 ;;
   1.962 -    i*86:*:5:[78]*)
   1.963 +	exit ;;
   1.964 +    i*86:*:5:[678]*)
   1.965 +    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
   1.966  	case `/bin/uname -X | grep "^Machine"` in
   1.967  	    *486*)	     UNAME_MACHINE=i486 ;;
   1.968  	    *Pentium)	     UNAME_MACHINE=i586 ;;
   1.969  	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
   1.970  	esac
   1.971  	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
   1.972 -	exit 0 ;;
   1.973 +	exit ;;
   1.974      i*86:*:3.2:*)
   1.975  	if test -f /usr/options/cb.name; then
   1.976  		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
   1.977 @@ -1001,73 +1098,73 @@
   1.978  	else
   1.979  		echo ${UNAME_MACHINE}-pc-sysv32
   1.980  	fi
   1.981 -	exit 0 ;;
   1.982 +	exit ;;
   1.983      pc:*:*:*)
   1.984  	# Left here for compatibility:
   1.985          # uname -m prints for DJGPP always 'pc', but it prints nothing about
   1.986          # the processor, so we play safe by assuming i386.
   1.987  	echo i386-pc-msdosdjgpp
   1.988 -        exit 0 ;;
   1.989 +        exit ;;
   1.990      Intel:Mach:3*:*)
   1.991  	echo i386-pc-mach3
   1.992 -	exit 0 ;;
   1.993 +	exit ;;
   1.994      paragon:*:*:*)
   1.995  	echo i860-intel-osf1
   1.996 -	exit 0 ;;
   1.997 +	exit ;;
   1.998      i860:*:4.*:*) # i860-SVR4
   1.999  	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
  1.1000  	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
  1.1001  	else # Add other i860-SVR4 vendors below as they are discovered.
  1.1002  	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
  1.1003  	fi
  1.1004 -	exit 0 ;;
  1.1005 +	exit ;;
  1.1006      mini*:CTIX:SYS*5:*)
  1.1007  	# "miniframe"
  1.1008  	echo m68010-convergent-sysv
  1.1009 -	exit 0 ;;
  1.1010 +	exit ;;
  1.1011      mc68k:UNIX:SYSTEM5:3.51m)
  1.1012  	echo m68k-convergent-sysv
  1.1013 -	exit 0 ;;
  1.1014 +	exit ;;
  1.1015      M680?0:D-NIX:5.3:*)
  1.1016  	echo m68k-diab-dnix
  1.1017 -	exit 0 ;;
  1.1018 -    M68*:*:R3V[567]*:*)
  1.1019 -	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
  1.1020 -    3[34]??:*: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)
  1.1021 +	exit ;;
  1.1022 +    M68*:*:R3V[5678]*:*)
  1.1023 +	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
  1.1024 +    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)
  1.1025  	OS_REL=''
  1.1026  	test -r /etc/.relid \
  1.1027  	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
  1.1028  	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
  1.1029 -	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
  1.1030 +	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
  1.1031  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
  1.1032 -	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
  1.1033 +	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
  1.1034      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
  1.1035          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
  1.1036 -          && echo i486-ncr-sysv4 && exit 0 ;;
  1.1037 +          && { echo i486-ncr-sysv4; exit; } ;;
  1.1038      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  1.1039  	echo m68k-unknown-lynxos${UNAME_RELEASE}
  1.1040 -	exit 0 ;;
  1.1041 +	exit ;;
  1.1042      mc68030:UNIX_System_V:4.*:*)
  1.1043  	echo m68k-atari-sysv4
  1.1044 -	exit 0 ;;
  1.1045 +	exit ;;
  1.1046      TSUNAMI:LynxOS:2.*:*)
  1.1047  	echo sparc-unknown-lynxos${UNAME_RELEASE}
  1.1048 -	exit 0 ;;
  1.1049 +	exit ;;
  1.1050      rs6000:LynxOS:2.*:*)
  1.1051  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  1.1052 -	exit 0 ;;
  1.1053 +	exit ;;
  1.1054      PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
  1.1055  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  1.1056 -	exit 0 ;;
  1.1057 +	exit ;;
  1.1058      SM[BE]S:UNIX_SV:*:*)
  1.1059  	echo mips-dde-sysv${UNAME_RELEASE}
  1.1060 -	exit 0 ;;
  1.1061 +	exit ;;
  1.1062      RM*:ReliantUNIX-*:*:*)
  1.1063  	echo mips-sni-sysv4
  1.1064 -	exit 0 ;;
  1.1065 +	exit ;;
  1.1066      RM*:SINIX-*:*:*)
  1.1067  	echo mips-sni-sysv4
  1.1068 -	exit 0 ;;
  1.1069 +	exit ;;
  1.1070      *:SINIX-*:*:*)
  1.1071  	if uname -p 2>/dev/null >/dev/null ; then
  1.1072  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
  1.1073 @@ -1075,68 +1172,81 @@
  1.1074  	else
  1.1075  		echo ns32k-sni-sysv
  1.1076  	fi
  1.1077 -	exit 0 ;;
  1.1078 +	exit ;;
  1.1079      PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
  1.1080                        # says <Richard.M.Bartel@ccMail.Census.GOV>
  1.1081          echo i586-unisys-sysv4
  1.1082 -        exit 0 ;;
  1.1083 +        exit ;;
  1.1084      *:UNIX_System_V:4*:FTX*)
  1.1085  	# From Gerald Hewes <hewes@openmarket.com>.
  1.1086  	# How about differentiating between stratus architectures? -djm
  1.1087  	echo hppa1.1-stratus-sysv4
  1.1088 -	exit 0 ;;
  1.1089 +	exit ;;
  1.1090      *:*:*:FTX*)
  1.1091  	# From seanf@swdc.stratus.com.
  1.1092  	echo i860-stratus-sysv4
  1.1093 -	exit 0 ;;
  1.1094 +	exit ;;
  1.1095 +    i*86:VOS:*:*)
  1.1096 +	# From Paul.Green@stratus.com.
  1.1097 +	echo ${UNAME_MACHINE}-stratus-vos
  1.1098 +	exit ;;
  1.1099      *:VOS:*:*)
  1.1100  	# From Paul.Green@stratus.com.
  1.1101  	echo hppa1.1-stratus-vos
  1.1102 -	exit 0 ;;
  1.1103 +	exit ;;
  1.1104      mc68*:A/UX:*:*)
  1.1105  	echo m68k-apple-aux${UNAME_RELEASE}
  1.1106 -	exit 0 ;;
  1.1107 +	exit ;;
  1.1108      news*:NEWS-OS:6*:*)
  1.1109  	echo mips-sony-newsos6
  1.1110 -	exit 0 ;;
  1.1111 +	exit ;;
  1.1112      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
  1.1113  	if [ -d /usr/nec ]; then
  1.1114  	        echo mips-nec-sysv${UNAME_RELEASE}
  1.1115  	else
  1.1116  	        echo mips-unknown-sysv${UNAME_RELEASE}
  1.1117  	fi
  1.1118 -        exit 0 ;;
  1.1119 +        exit ;;
  1.1120      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  1.1121  	echo powerpc-be-beos
  1.1122 -	exit 0 ;;
  1.1123 +	exit ;;
  1.1124      BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
  1.1125  	echo powerpc-apple-beos
  1.1126 -	exit 0 ;;
  1.1127 +	exit ;;
  1.1128      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  1.1129  	echo i586-pc-beos
  1.1130 -	exit 0 ;;
  1.1131 +	exit ;;
  1.1132      SX-4:SUPER-UX:*:*)
  1.1133  	echo sx4-nec-superux${UNAME_RELEASE}
  1.1134 -	exit 0 ;;
  1.1135 +	exit ;;
  1.1136      SX-5:SUPER-UX:*:*)
  1.1137  	echo sx5-nec-superux${UNAME_RELEASE}
  1.1138 -	exit 0 ;;
  1.1139 +	exit ;;
  1.1140      SX-6:SUPER-UX:*:*)
  1.1141  	echo sx6-nec-superux${UNAME_RELEASE}
  1.1142 -	exit 0 ;;
  1.1143 +	exit ;;
  1.1144 +    SX-7:SUPER-UX:*:*)
  1.1145 +	echo sx7-nec-superux${UNAME_RELEASE}
  1.1146 +	exit ;;
  1.1147 +    SX-8:SUPER-UX:*:*)
  1.1148 +	echo sx8-nec-superux${UNAME_RELEASE}
  1.1149 +	exit ;;
  1.1150 +    SX-8R:SUPER-UX:*:*)
  1.1151 +	echo sx8r-nec-superux${UNAME_RELEASE}
  1.1152 +	exit ;;
  1.1153      Power*:Rhapsody:*:*)
  1.1154  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
  1.1155 -	exit 0 ;;
  1.1156 +	exit ;;
  1.1157      *:Rhapsody:*:*)
  1.1158  	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
  1.1159 -	exit 0 ;;
  1.1160 +	exit ;;
  1.1161      *:Darwin:*:*)
  1.1162 -	case `uname -p` in
  1.1163 -	    *86) UNAME_PROCESSOR=i686 ;;
  1.1164 -	    powerpc) UNAME_PROCESSOR=powerpc ;;
  1.1165 +	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
  1.1166 +	case $UNAME_PROCESSOR in
  1.1167 +	    unknown) UNAME_PROCESSOR=powerpc ;;
  1.1168  	esac
  1.1169  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  1.1170 -	exit 0 ;;
  1.1171 +	exit ;;
  1.1172      *:procnto*:*:* | *:QNX:[0123456789]*:*)
  1.1173  	UNAME_PROCESSOR=`uname -p`
  1.1174  	if test "$UNAME_PROCESSOR" = "x86"; then
  1.1175 @@ -1144,22 +1254,25 @@
  1.1176  		UNAME_MACHINE=pc
  1.1177  	fi
  1.1178  	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
  1.1179 -	exit 0 ;;
  1.1180 +	exit ;;
  1.1181      *:QNX:*:4*)
  1.1182  	echo i386-pc-qnx
  1.1183 -	exit 0 ;;
  1.1184 -    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
  1.1185 +	exit ;;
  1.1186 +    NSE-?:NONSTOP_KERNEL:*:*)
  1.1187 +	echo nse-tandem-nsk${UNAME_RELEASE}
  1.1188 +	exit ;;
  1.1189 +    NSR-?:NONSTOP_KERNEL:*:*)
  1.1190  	echo nsr-tandem-nsk${UNAME_RELEASE}
  1.1191 -	exit 0 ;;
  1.1192 +	exit ;;
  1.1193      *:NonStop-UX:*:*)
  1.1194  	echo mips-compaq-nonstopux
  1.1195 -	exit 0 ;;
  1.1196 +	exit ;;
  1.1197      BS2000:POSIX*:*:*)
  1.1198  	echo bs2000-siemens-sysv
  1.1199 -	exit 0 ;;
  1.1200 +	exit ;;
  1.1201      DS/*:UNIX_System_V:*:*)
  1.1202  	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
  1.1203 -	exit 0 ;;
  1.1204 +	exit ;;
  1.1205      *:Plan9:*:*)
  1.1206  	# "uname -m" is not consistent, so use $cputype instead. 386
  1.1207  	# is converted to i386 for consistency with other x86
  1.1208 @@ -1170,25 +1283,47 @@
  1.1209  	    UNAME_MACHINE="$cputype"
  1.1210  	fi
  1.1211  	echo ${UNAME_MACHINE}-unknown-plan9
  1.1212 -	exit 0 ;;
  1.1213 +	exit ;;
  1.1214      *:TOPS-10:*:*)
  1.1215  	echo pdp10-unknown-tops10
  1.1216 -	exit 0 ;;
  1.1217 +	exit ;;
  1.1218      *:TENEX:*:*)
  1.1219  	echo pdp10-unknown-tenex
  1.1220 -	exit 0 ;;
  1.1221 +	exit ;;
  1.1222      KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
  1.1223  	echo pdp10-dec-tops20
  1.1224 -	exit 0 ;;
  1.1225 +	exit ;;
  1.1226      XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
  1.1227  	echo pdp10-xkl-tops20
  1.1228 -	exit 0 ;;
  1.1229 +	exit ;;
  1.1230      *:TOPS-20:*:*)
  1.1231  	echo pdp10-unknown-tops20
  1.1232 -	exit 0 ;;
  1.1233 +	exit ;;
  1.1234      *:ITS:*:*)
  1.1235  	echo pdp10-unknown-its
  1.1236 -	exit 0 ;;
  1.1237 +	exit ;;
  1.1238 +    SEI:*:*:SEIUX)
  1.1239 +        echo mips-sei-seiux${UNAME_RELEASE}
  1.1240 +	exit ;;
  1.1241 +    *:DragonFly:*:*)
  1.1242 +	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  1.1243 +	exit ;;
  1.1244 +    *:*VMS:*:*)
  1.1245 +    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
  1.1246 +	case "${UNAME_MACHINE}" in
  1.1247 +	    A*) echo alpha-dec-vms ; exit ;;
  1.1248 +	    I*) echo ia64-dec-vms ; exit ;;
  1.1249 +	    V*) echo vax-dec-vms ; exit ;;
  1.1250 +	esac ;;
  1.1251 +    *:XENIX:*:SysV)
  1.1252 +	echo i386-pc-xenix
  1.1253 +	exit ;;
  1.1254 +    i*86:skyos:*:*)
  1.1255 +	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
  1.1256 +	exit ;;
  1.1257 +    i*86:rdos:*:*)
  1.1258 +	echo ${UNAME_MACHINE}-pc-rdos
  1.1259 +	exit ;;
  1.1260  esac
  1.1261  
  1.1262  #echo '(No uname command or uname output not recognized.)' 1>&2
  1.1263 @@ -1220,7 +1355,7 @@
  1.1264  #endif
  1.1265  
  1.1266  #if defined (__arm) && defined (__acorn) && defined (__unix)
  1.1267 -  printf ("arm-acorn-riscix"); exit (0);
  1.1268 +  printf ("arm-acorn-riscix\n"); exit (0);
  1.1269  #endif
  1.1270  
  1.1271  #if defined (hp300) && !defined (hpux)
  1.1272 @@ -1309,11 +1444,12 @@
  1.1273  }
  1.1274  EOF
  1.1275  
  1.1276 -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
  1.1277 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
  1.1278 +	{ echo "$SYSTEM_NAME"; exit; }
  1.1279  
  1.1280  # Apollos put the system type in the environment.
  1.1281  
  1.1282 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
  1.1283 +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
  1.1284  
  1.1285  # Convex versions that predate uname can use getsysinfo(1)
  1.1286  
  1.1287 @@ -1322,22 +1458,22 @@
  1.1288      case `getsysinfo -f cpu_type` in
  1.1289      c1*)
  1.1290  	echo c1-convex-bsd
  1.1291 -	exit 0 ;;
  1.1292 +	exit ;;
  1.1293      c2*)
  1.1294  	if getsysinfo -f scalar_acc
  1.1295  	then echo c32-convex-bsd
  1.1296  	else echo c2-convex-bsd
  1.1297  	fi
  1.1298 -	exit 0 ;;
  1.1299 +	exit ;;
  1.1300      c34*)
  1.1301  	echo c34-convex-bsd
  1.1302 -	exit 0 ;;
  1.1303 +	exit ;;
  1.1304      c38*)
  1.1305  	echo c38-convex-bsd
  1.1306 -	exit 0 ;;
  1.1307 +	exit ;;
  1.1308      c4*)
  1.1309  	echo c4-convex-bsd
  1.1310 -	exit 0 ;;
  1.1311 +	exit ;;
  1.1312      esac
  1.1313  fi
  1.1314  
  1.1315 @@ -1348,7 +1484,9 @@
  1.1316  the operating system you are using. It is advised that you
  1.1317  download the most up to date version of the config scripts from
  1.1318  
  1.1319 -    ftp://ftp.gnu.org/pub/gnu/config/
  1.1320 +  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
  1.1321 +and
  1.1322 +  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
  1.1323  
  1.1324  If the version you run ($0) is already up to date, please
  1.1325  send the following data and any information you think might be