1.1 --- a/config.guess	Sat Nov 17 01:30:01 2007 +0000
     1.2 +++ b/config.guess	Thu Jan 26 20:16:51 2012 +1000
     1.3 @@ -1,10 +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, 2004, 2005, 2006 Free Software Foundation,
     1.8 -#   Inc.
     1.9 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
    1.10 +#   2011 Free Software Foundation, Inc.
    1.11  
    1.12 -timestamp='2006-07-02'
    1.13 +timestamp='2011-06-03'
    1.14  
    1.15  # This file is free software; you can redistribute it and/or modify it
    1.16  # under the terms of the GNU General Public License as published by
    1.17 @@ -27,16 +27,16 @@
    1.18  # the same distribution terms that you use for the rest of that program.
    1.19  
    1.20  
    1.21 -# Originally written by Per Bothner <per@bothner.com>.
    1.22 -# Please send patches to <config-patches@gnu.org>.  Submit a context
    1.23 -# diff and a properly formatted ChangeLog entry.
    1.24 +# Originally written by Per Bothner.  Please send patches (context
    1.25 +# diff format) to <config-patches@gnu.org> and include a ChangeLog
    1.26 +# entry.
    1.27  #
    1.28  # This script attempts to guess a canonical system name similar to
    1.29  # config.sub.  If it succeeds, it prints the system name on stdout, and
    1.30  # exits with 0.  Otherwise, it exits with 1.
    1.31  #
    1.32 -# The plan is that this can be called by configure scripts if you
    1.33 -# don't specify an explicit build system type.
    1.34 +# You can get the latest version of this script from:
    1.35 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
    1.36  
    1.37  me=`echo "$0" | sed -e 's,.*/,,'`
    1.38  
    1.39 @@ -56,8 +56,9 @@
    1.40  GNU config.guess ($timestamp)
    1.41  
    1.42  Originally written by Per Bothner.
    1.43 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    1.44 -Free Software Foundation, Inc.
    1.45 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    1.46 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
    1.47 +Software Foundation, Inc.
    1.48  
    1.49  This is free software; see the source for copying conditions.  There is NO
    1.50  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    1.51 @@ -161,6 +162,7 @@
    1.52  	    arm*) machine=arm-unknown ;;
    1.53  	    sh3el) machine=shl-unknown ;;
    1.54  	    sh3eb) machine=sh-unknown ;;
    1.55 +	    sh5el) machine=sh5le-unknown ;;
    1.56  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
    1.57  	esac
    1.58  	# The Operating System including object format, if it has switched
    1.59 @@ -169,7 +171,7 @@
    1.60  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
    1.61  		eval $set_cc_for_build
    1.62  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
    1.63 -			| grep __ELF__ >/dev/null
    1.64 +			| grep -q __ELF__
    1.65  		then
    1.66  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
    1.67  		    # Return netbsd for either.  FIX?
    1.68 @@ -179,7 +181,7 @@
    1.69  		fi
    1.70  		;;
    1.71  	    *)
    1.72 -	        os=netbsd
    1.73 +		os=netbsd
    1.74  		;;
    1.75  	esac
    1.76  	# The OS release
    1.77 @@ -222,7 +224,7 @@
    1.78  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
    1.79  		;;
    1.80  	*5.*)
    1.81 -	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
    1.82 +		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
    1.83  		;;
    1.84  	esac
    1.85  	# According to Compaq, /usr/sbin/psrinfo has been available on
    1.86 @@ -268,7 +270,10 @@
    1.87  	# A Xn.n version is an unreleased experimental baselevel.
    1.88  	# 1.2 uses "1.2" for uname -r.
    1.89  	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    1.90 -	exit ;;
    1.91 +	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
    1.92 +	exitcode=$?
    1.93 +	trap '' 0
    1.94 +	exit $exitcode ;;
    1.95      Alpha\ *:Windows_NT*:*)
    1.96  	# How do we know it's Interix rather than the generic POSIX subsystem?
    1.97  	# Should we change UNAME_MACHINE based on the output of uname instead
    1.98 @@ -294,7 +299,7 @@
    1.99  	echo s390-ibm-zvmoe
   1.100  	exit ;;
   1.101      *:OS400:*:*)
   1.102 -        echo powerpc-ibm-os400
   1.103 +	echo powerpc-ibm-os400
   1.104  	exit ;;
   1.105      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   1.106  	echo arm-acorn-riscix${UNAME_RELEASE}
   1.107 @@ -323,14 +328,33 @@
   1.108  	case `/usr/bin/uname -p` in
   1.109  	    sparc) echo sparc-icl-nx7; exit ;;
   1.110  	esac ;;
   1.111 +    s390x:SunOS:*:*)
   1.112 +	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.113 +	exit ;;
   1.114      sun4H:SunOS:5.*:*)
   1.115  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.116  	exit ;;
   1.117      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
   1.118  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.119  	exit ;;
   1.120 -    i86pc:SunOS:5.*:*)
   1.121 -	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.122 +    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
   1.123 +	echo i386-pc-auroraux${UNAME_RELEASE}
   1.124 +	exit ;;
   1.125 +    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
   1.126 +	eval $set_cc_for_build
   1.127 +	SUN_ARCH="i386"
   1.128 +	# If there is a compiler, see if it is configured for 64-bit objects.
   1.129 +	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
   1.130 +	# This test works for both compilers.
   1.131 +	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
   1.132 +	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
   1.133 +		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
   1.134 +		grep IS_64BIT_ARCH >/dev/null
   1.135 +	    then
   1.136 +		SUN_ARCH="x86_64"
   1.137 +	    fi
   1.138 +	fi
   1.139 +	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.140  	exit ;;
   1.141      sun4*:SunOS:6*:*)
   1.142  	# According to config.sub, this is the proper way to canonicalize
   1.143 @@ -374,23 +398,23 @@
   1.144      # MiNT.  But MiNT is downward compatible to TOS, so this should
   1.145      # be no problem.
   1.146      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
   1.147 -        echo m68k-atari-mint${UNAME_RELEASE}
   1.148 +	echo m68k-atari-mint${UNAME_RELEASE}
   1.149  	exit ;;
   1.150      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
   1.151  	echo m68k-atari-mint${UNAME_RELEASE}
   1.152 -        exit ;;
   1.153 +	exit ;;
   1.154      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
   1.155 -        echo m68k-atari-mint${UNAME_RELEASE}
   1.156 +	echo m68k-atari-mint${UNAME_RELEASE}
   1.157  	exit ;;
   1.158      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
   1.159 -        echo m68k-milan-mint${UNAME_RELEASE}
   1.160 -        exit ;;
   1.161 +	echo m68k-milan-mint${UNAME_RELEASE}
   1.162 +	exit ;;
   1.163      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
   1.164 -        echo m68k-hades-mint${UNAME_RELEASE}
   1.165 -        exit ;;
   1.166 +	echo m68k-hades-mint${UNAME_RELEASE}
   1.167 +	exit ;;
   1.168      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
   1.169 -        echo m68k-unknown-mint${UNAME_RELEASE}
   1.170 -        exit ;;
   1.171 +	echo m68k-unknown-mint${UNAME_RELEASE}
   1.172 +	exit ;;
   1.173      m68k:machten:*:*)
   1.174  	echo m68k-apple-machten${UNAME_RELEASE}
   1.175  	exit ;;
   1.176 @@ -460,8 +484,8 @@
   1.177  	echo m88k-motorola-sysv3
   1.178  	exit ;;
   1.179      AViiON:dgux:*:*)
   1.180 -        # DG/UX returns AViiON for all architectures
   1.181 -        UNAME_PROCESSOR=`/usr/bin/uname -p`
   1.182 +	# DG/UX returns AViiON for all architectures
   1.183 +	UNAME_PROCESSOR=`/usr/bin/uname -p`
   1.184  	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
   1.185  	then
   1.186  	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
   1.187 @@ -474,7 +498,7 @@
   1.188  	else
   1.189  	    echo i586-dg-dgux${UNAME_RELEASE}
   1.190  	fi
   1.191 - 	exit ;;
   1.192 +	exit ;;
   1.193      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
   1.194  	echo m88k-dolphin-sysv3
   1.195  	exit ;;
   1.196 @@ -531,7 +555,7 @@
   1.197  		echo rs6000-ibm-aix3.2
   1.198  	fi
   1.199  	exit ;;
   1.200 -    *:AIX:*:[45])
   1.201 +    *:AIX:*:[4567])
   1.202  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
   1.203  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
   1.204  		IBM_ARCH=rs6000
   1.205 @@ -574,52 +598,52 @@
   1.206  	    9000/[678][0-9][0-9])
   1.207  		if [ -x /usr/bin/getconf ]; then
   1.208  		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
   1.209 -                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
   1.210 -                    case "${sc_cpu_version}" in
   1.211 -                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
   1.212 -                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
   1.213 -                      532)                      # CPU_PA_RISC2_0
   1.214 -                        case "${sc_kernel_bits}" in
   1.215 -                          32) HP_ARCH="hppa2.0n" ;;
   1.216 -                          64) HP_ARCH="hppa2.0w" ;;
   1.217 +		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
   1.218 +		    case "${sc_cpu_version}" in
   1.219 +		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
   1.220 +		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
   1.221 +		      532)                      # CPU_PA_RISC2_0
   1.222 +			case "${sc_kernel_bits}" in
   1.223 +			  32) HP_ARCH="hppa2.0n" ;;
   1.224 +			  64) HP_ARCH="hppa2.0w" ;;
   1.225  			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
   1.226 -                        esac ;;
   1.227 -                    esac
   1.228 +			esac ;;
   1.229 +		    esac
   1.230  		fi
   1.231  		if [ "${HP_ARCH}" = "" ]; then
   1.232  		    eval $set_cc_for_build
   1.233 -		    sed 's/^              //' << EOF >$dummy.c
   1.234 +		    sed 's/^		//' << EOF >$dummy.c
   1.235  
   1.236 -              #define _HPUX_SOURCE
   1.237 -              #include <stdlib.h>
   1.238 -              #include <unistd.h>
   1.239 +		#define _HPUX_SOURCE
   1.240 +		#include <stdlib.h>
   1.241 +		#include <unistd.h>
   1.242  
   1.243 -              int main ()
   1.244 -              {
   1.245 -              #if defined(_SC_KERNEL_BITS)
   1.246 -                  long bits = sysconf(_SC_KERNEL_BITS);
   1.247 -              #endif
   1.248 -                  long cpu  = sysconf (_SC_CPU_VERSION);
   1.249 +		int main ()
   1.250 +		{
   1.251 +		#if defined(_SC_KERNEL_BITS)
   1.252 +		    long bits = sysconf(_SC_KERNEL_BITS);
   1.253 +		#endif
   1.254 +		    long cpu  = sysconf (_SC_CPU_VERSION);
   1.255  
   1.256 -                  switch (cpu)
   1.257 -              	{
   1.258 -              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
   1.259 -              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
   1.260 -              	case CPU_PA_RISC2_0:
   1.261 -              #if defined(_SC_KERNEL_BITS)
   1.262 -              	    switch (bits)
   1.263 -              		{
   1.264 -              		case 64: puts ("hppa2.0w"); break;
   1.265 -              		case 32: puts ("hppa2.0n"); break;
   1.266 -              		default: puts ("hppa2.0"); break;
   1.267 -              		} break;
   1.268 -              #else  /* !defined(_SC_KERNEL_BITS) */
   1.269 -              	    puts ("hppa2.0"); break;
   1.270 -              #endif
   1.271 -              	default: puts ("hppa1.0"); break;
   1.272 -              	}
   1.273 -                  exit (0);
   1.274 -              }
   1.275 +		    switch (cpu)
   1.276 +			{
   1.277 +			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
   1.278 +			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
   1.279 +			case CPU_PA_RISC2_0:
   1.280 +		#if defined(_SC_KERNEL_BITS)
   1.281 +			    switch (bits)
   1.282 +				{
   1.283 +				case 64: puts ("hppa2.0w"); break;
   1.284 +				case 32: puts ("hppa2.0n"); break;
   1.285 +				default: puts ("hppa2.0"); break;
   1.286 +				} break;
   1.287 +		#else  /* !defined(_SC_KERNEL_BITS) */
   1.288 +			    puts ("hppa2.0"); break;
   1.289 +		#endif
   1.290 +			default: puts ("hppa1.0"); break;
   1.291 +			}
   1.292 +		    exit (0);
   1.293 +		}
   1.294  EOF
   1.295  		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
   1.296  		    test -z "$HP_ARCH" && HP_ARCH=hppa
   1.297 @@ -639,7 +663,7 @@
   1.298  	    # => hppa64-hp-hpux11.23
   1.299  
   1.300  	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
   1.301 -		grep __LP64__ >/dev/null
   1.302 +		grep -q __LP64__
   1.303  	    then
   1.304  		HP_ARCH="hppa2.0w"
   1.305  	    else
   1.306 @@ -710,22 +734,22 @@
   1.307  	exit ;;
   1.308      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
   1.309  	echo c1-convex-bsd
   1.310 -        exit ;;
   1.311 +	exit ;;
   1.312      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
   1.313  	if getsysinfo -f scalar_acc
   1.314  	then echo c32-convex-bsd
   1.315  	else echo c2-convex-bsd
   1.316  	fi
   1.317 -        exit ;;
   1.318 +	exit ;;
   1.319      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
   1.320  	echo c34-convex-bsd
   1.321 -        exit ;;
   1.322 +	exit ;;
   1.323      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
   1.324  	echo c38-convex-bsd
   1.325 -        exit ;;
   1.326 +	exit ;;
   1.327      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
   1.328  	echo c4-convex-bsd
   1.329 -        exit ;;
   1.330 +	exit ;;
   1.331      CRAY*Y-MP:*:*:*)
   1.332  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.333  	exit ;;
   1.334 @@ -749,14 +773,14 @@
   1.335  	exit ;;
   1.336      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
   1.337  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   1.338 -        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.339 -        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
   1.340 -        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.341 -        exit ;;
   1.342 +	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.343 +	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
   1.344 +	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.345 +	exit ;;
   1.346      5000:UNIX_System_V:4.*:*)
   1.347 -        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.348 -        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
   1.349 -        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.350 +	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.351 +	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
   1.352 +	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.353  	exit ;;
   1.354      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   1.355  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   1.356 @@ -780,25 +804,34 @@
   1.357      i*:CYGWIN*:*)
   1.358  	echo ${UNAME_MACHINE}-pc-cygwin
   1.359  	exit ;;
   1.360 -    i*:MINGW*:*)
   1.361 +    *:MINGW*:*)
   1.362  	echo ${UNAME_MACHINE}-pc-mingw32
   1.363  	exit ;;
   1.364      i*:windows32*:*)
   1.365 -    	# uname -m includes "-pc" on this system.
   1.366 -    	echo ${UNAME_MACHINE}-mingw32
   1.367 +	# uname -m includes "-pc" on this system.
   1.368 +	echo ${UNAME_MACHINE}-mingw32
   1.369  	exit ;;
   1.370      i*:PW*:*)
   1.371  	echo ${UNAME_MACHINE}-pc-pw32
   1.372  	exit ;;
   1.373 -    x86:Interix*:[3456]*)
   1.374 -	echo i586-pc-interix${UNAME_RELEASE}
   1.375 -	exit ;;
   1.376 -    EM64T:Interix*:[3456]*)
   1.377 -	echo x86_64-unknown-interix${UNAME_RELEASE}
   1.378 -	exit ;;
   1.379 +    *:Interix*:*)
   1.380 +	case ${UNAME_MACHINE} in
   1.381 +	    x86)
   1.382 +		echo i586-pc-interix${UNAME_RELEASE}
   1.383 +		exit ;;
   1.384 +	    authenticamd | genuineintel | EM64T)
   1.385 +		echo x86_64-unknown-interix${UNAME_RELEASE}
   1.386 +		exit ;;
   1.387 +	    IA64)
   1.388 +		echo ia64-unknown-interix${UNAME_RELEASE}
   1.389 +		exit ;;
   1.390 +	esac ;;
   1.391      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
   1.392  	echo i${UNAME_MACHINE}-pc-mks
   1.393  	exit ;;
   1.394 +    8664:Windows_NT:*)
   1.395 +	echo x86_64-pc-mks
   1.396 +	exit ;;
   1.397      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
   1.398  	# How do we know it's Interix rather than the generic POSIX subsystem?
   1.399  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
   1.400 @@ -828,8 +861,35 @@
   1.401      i*86:Minix:*:*)
   1.402  	echo ${UNAME_MACHINE}-pc-minix
   1.403  	exit ;;
   1.404 +    alpha:Linux:*:*)
   1.405 +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
   1.406 +	  EV5)   UNAME_MACHINE=alphaev5 ;;
   1.407 +	  EV56)  UNAME_MACHINE=alphaev56 ;;
   1.408 +	  PCA56) UNAME_MACHINE=alphapca56 ;;
   1.409 +	  PCA57) UNAME_MACHINE=alphapca56 ;;
   1.410 +	  EV6)   UNAME_MACHINE=alphaev6 ;;
   1.411 +	  EV67)  UNAME_MACHINE=alphaev67 ;;
   1.412 +	  EV68*) UNAME_MACHINE=alphaev68 ;;
   1.413 +	esac
   1.414 +	objdump --private-headers /bin/sh | grep -q ld.so.1
   1.415 +	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
   1.416 +	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
   1.417 +	exit ;;
   1.418      arm*:Linux:*:*)
   1.419 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.420 +	eval $set_cc_for_build
   1.421 +	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
   1.422 +	    | grep -q __ARM_EABI__
   1.423 +	then
   1.424 +	    echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.425 +	else
   1.426 +	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
   1.427 +		| grep -q __ARM_PCS_VFP
   1.428 +	    then
   1.429 +		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
   1.430 +	    else
   1.431 +		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
   1.432 +	    fi
   1.433 +	fi
   1.434  	exit ;;
   1.435      avr32*:Linux:*:*)
   1.436  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.437 @@ -841,7 +901,18 @@
   1.438  	echo crisv32-axis-linux-gnu
   1.439  	exit ;;
   1.440      frv:Linux:*:*)
   1.441 -    	echo frv-unknown-linux-gnu
   1.442 +	echo frv-unknown-linux-gnu
   1.443 +	exit ;;
   1.444 +    i*86:Linux:*:*)
   1.445 +	LIBC=gnu
   1.446 +	eval $set_cc_for_build
   1.447 +	sed 's/^	//' << EOF >$dummy.c
   1.448 +	#ifdef __dietlibc__
   1.449 +	LIBC=dietlibc
   1.450 +	#endif
   1.451 +EOF
   1.452 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
   1.453 +	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
   1.454  	exit ;;
   1.455      ia64:Linux:*:*)
   1.456  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.457 @@ -852,74 +923,33 @@
   1.458      m68*:Linux:*:*)
   1.459  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.460  	exit ;;
   1.461 -    mips:Linux:*:*)
   1.462 +    mips:Linux:*:* | mips64:Linux:*:*)
   1.463  	eval $set_cc_for_build
   1.464  	sed 's/^	//' << EOF >$dummy.c
   1.465  	#undef CPU
   1.466 -	#undef mips
   1.467 -	#undef mipsel
   1.468 +	#undef ${UNAME_MACHINE}
   1.469 +	#undef ${UNAME_MACHINE}el
   1.470  	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
   1.471 -	CPU=mipsel
   1.472 +	CPU=${UNAME_MACHINE}el
   1.473  	#else
   1.474  	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
   1.475 -	CPU=mips
   1.476 +	CPU=${UNAME_MACHINE}
   1.477  	#else
   1.478  	CPU=
   1.479  	#endif
   1.480  	#endif
   1.481  EOF
   1.482 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
   1.483 -	    /^CPU/{
   1.484 -		s: ::g
   1.485 -		p
   1.486 -	    }'`"
   1.487 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
   1.488 -	;;
   1.489 -    mips64:Linux:*:*)
   1.490 -	eval $set_cc_for_build
   1.491 -	sed 's/^	//' << EOF >$dummy.c
   1.492 -	#undef CPU
   1.493 -	#undef mips64
   1.494 -	#undef mips64el
   1.495 -	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
   1.496 -	CPU=mips64el
   1.497 -	#else
   1.498 -	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
   1.499 -	CPU=mips64
   1.500 -	#else
   1.501 -	CPU=
   1.502 -	#endif
   1.503 -	#endif
   1.504 -EOF
   1.505 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
   1.506 -	    /^CPU/{
   1.507 -		s: ::g
   1.508 -		p
   1.509 -	    }'`"
   1.510 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
   1.511  	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
   1.512  	;;
   1.513      or32:Linux:*:*)
   1.514  	echo or32-unknown-linux-gnu
   1.515  	exit ;;
   1.516 -    ppc:Linux:*:*)
   1.517 -	echo powerpc-unknown-linux-gnu
   1.518 +    padre:Linux:*:*)
   1.519 +	echo sparc-unknown-linux-gnu
   1.520  	exit ;;
   1.521 -    ppc64:Linux:*:*)
   1.522 -	echo powerpc64-unknown-linux-gnu
   1.523 -	exit ;;
   1.524 -    alpha:Linux:*:*)
   1.525 -	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
   1.526 -	  EV5)   UNAME_MACHINE=alphaev5 ;;
   1.527 -	  EV56)  UNAME_MACHINE=alphaev56 ;;
   1.528 -	  PCA56) UNAME_MACHINE=alphapca56 ;;
   1.529 -	  PCA57) UNAME_MACHINE=alphapca56 ;;
   1.530 -	  EV6)   UNAME_MACHINE=alphaev6 ;;
   1.531 -	  EV67)  UNAME_MACHINE=alphaev67 ;;
   1.532 -	  EV68*) UNAME_MACHINE=alphaev68 ;;
   1.533 -        esac
   1.534 -	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
   1.535 -	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
   1.536 -	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
   1.537 +    parisc64:Linux:*:* | hppa64:Linux:*:*)
   1.538 +	echo hppa64-unknown-linux-gnu
   1.539  	exit ;;
   1.540      parisc:Linux:*:* | hppa:Linux:*:*)
   1.541  	# Look for CPU level
   1.542 @@ -929,14 +959,17 @@
   1.543  	  *)    echo hppa-unknown-linux-gnu ;;
   1.544  	esac
   1.545  	exit ;;
   1.546 -    parisc64:Linux:*:* | hppa64:Linux:*:*)
   1.547 -	echo hppa64-unknown-linux-gnu
   1.548 +    ppc64:Linux:*:*)
   1.549 +	echo powerpc64-unknown-linux-gnu
   1.550 +	exit ;;
   1.551 +    ppc:Linux:*:*)
   1.552 +	echo powerpc-unknown-linux-gnu
   1.553  	exit ;;
   1.554      s390:Linux:*:* | s390x:Linux:*:*)
   1.555  	echo ${UNAME_MACHINE}-ibm-linux
   1.556  	exit ;;
   1.557      sh64*:Linux:*:*)
   1.558 -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.559 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.560  	exit ;;
   1.561      sh*:Linux:*:*)
   1.562  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.563 @@ -944,75 +977,18 @@
   1.564      sparc:Linux:*:* | sparc64:Linux:*:*)
   1.565  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.566  	exit ;;
   1.567 +    tile*:Linux:*:*)
   1.568 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.569 +	exit ;;
   1.570      vax:Linux:*:*)
   1.571  	echo ${UNAME_MACHINE}-dec-linux-gnu
   1.572  	exit ;;
   1.573      x86_64:Linux:*:*)
   1.574  	echo x86_64-unknown-linux-gnu
   1.575  	exit ;;
   1.576 -    i*86:Linux:*:*)
   1.577 -	# The BFD linker knows what the default object file format is, so
   1.578 -	# first see if it will tell us. cd to the root directory to prevent
   1.579 -	# problems with other programs or directories called `ld' in the path.
   1.580 -	# Set LC_ALL=C to ensure ld outputs messages in English.
   1.581 -	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
   1.582 -			 | sed -ne '/supported targets:/!d
   1.583 -				    s/[ 	][ 	]*/ /g
   1.584 -				    s/.*supported targets: *//
   1.585 -				    s/ .*//
   1.586 -				    p'`
   1.587 -        case "$ld_supported_targets" in
   1.588 -	  elf32-i386)
   1.589 -		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
   1.590 -		;;
   1.591 -	  a.out-i386-linux)
   1.592 -		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
   1.593 -		exit ;;
   1.594 -	  coff-i386)
   1.595 -		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
   1.596 -		exit ;;
   1.597 -	  "")
   1.598 -		# Either a pre-BFD a.out linker (linux-gnuoldld) or
   1.599 -		# one that does not give us useful --help.
   1.600 -		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
   1.601 -		exit ;;
   1.602 -	esac
   1.603 -	# Determine whether the default compiler is a.out or elf
   1.604 -	eval $set_cc_for_build
   1.605 -	sed 's/^	//' << EOF >$dummy.c
   1.606 -	#include <features.h>
   1.607 -	#ifdef __ELF__
   1.608 -	# ifdef __GLIBC__
   1.609 -	#  if __GLIBC__ >= 2
   1.610 -	LIBC=gnu
   1.611 -	#  else
   1.612 -	LIBC=gnulibc1
   1.613 -	#  endif
   1.614 -	# else
   1.615 -	LIBC=gnulibc1
   1.616 -	# endif
   1.617 -	#else
   1.618 -	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
   1.619 -	LIBC=gnu
   1.620 -	#else
   1.621 -	LIBC=gnuaout
   1.622 -	#endif
   1.623 -	#endif
   1.624 -	#ifdef __dietlibc__
   1.625 -	LIBC=dietlibc
   1.626 -	#endif
   1.627 -EOF
   1.628 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
   1.629 -	    /^LIBC/{
   1.630 -		s: ::g
   1.631 -		p
   1.632 -	    }'`"
   1.633 -	test x"${LIBC}" != x && {
   1.634 -		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
   1.635 -		exit
   1.636 -	}
   1.637 -	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
   1.638 -	;;
   1.639 +    xtensa*:Linux:*:*)
   1.640 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.641 +	exit ;;
   1.642      i*86:DYNIX/ptx:4*:*)
   1.643  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
   1.644  	# earlier versions are messed up and put the nodename in both
   1.645 @@ -1020,11 +996,11 @@
   1.646  	echo i386-sequent-sysv4
   1.647  	exit ;;
   1.648      i*86:UNIX_SV:4.2MP:2.*)
   1.649 -        # Unixware is an offshoot of SVR4, but it has its own version
   1.650 -        # number series starting with 2...
   1.651 -        # I am not positive that other SVR4 systems won't match this,
   1.652 +	# Unixware is an offshoot of SVR4, but it has its own version
   1.653 +	# number series starting with 2...
   1.654 +	# I am not positive that other SVR4 systems won't match this,
   1.655  	# I just have to hope.  -- rms.
   1.656 -        # Use sysv4.2uw... so that sysv4* matches it.
   1.657 +	# Use sysv4.2uw... so that sysv4* matches it.
   1.658  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
   1.659  	exit ;;
   1.660      i*86:OS/2:*:*)
   1.661 @@ -1041,7 +1017,7 @@
   1.662      i*86:syllable:*:*)
   1.663  	echo ${UNAME_MACHINE}-pc-syllable
   1.664  	exit ;;
   1.665 -    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
   1.666 +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
   1.667  	echo i386-unknown-lynxos${UNAME_RELEASE}
   1.668  	exit ;;
   1.669      i*86:*DOS:*:*)
   1.670 @@ -1056,7 +1032,7 @@
   1.671  	fi
   1.672  	exit ;;
   1.673      i*86:*:5:[678]*)
   1.674 -    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
   1.675 +	# UnixWare 7.x, OpenUNIX and OpenServer 6.
   1.676  	case `/bin/uname -X | grep "^Machine"` in
   1.677  	    *486*)	     UNAME_MACHINE=i486 ;;
   1.678  	    *Pentium)	     UNAME_MACHINE=i586 ;;
   1.679 @@ -1084,10 +1060,13 @@
   1.680  	exit ;;
   1.681      pc:*:*:*)
   1.682  	# Left here for compatibility:
   1.683 -        # uname -m prints for DJGPP always 'pc', but it prints nothing about
   1.684 -        # the processor, so we play safe by assuming i386.
   1.685 -	echo i386-pc-msdosdjgpp
   1.686 -        exit ;;
   1.687 +	# uname -m prints for DJGPP always 'pc', but it prints nothing about
   1.688 +	# the processor, so we play safe by assuming i586.
   1.689 +	# Note: whatever this is, it MUST be the same as what config.sub
   1.690 +	# prints for the "djgpp" host, or else GDB configury will decide that
   1.691 +	# this is a cross-build.
   1.692 +	echo i586-pc-msdosdjgpp
   1.693 +	exit ;;
   1.694      Intel:Mach:3*:*)
   1.695  	echo i386-pc-mach3
   1.696  	exit ;;
   1.697 @@ -1122,8 +1101,18 @@
   1.698  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
   1.699  	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
   1.700      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
   1.701 -        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
   1.702 -          && { echo i486-ncr-sysv4; exit; } ;;
   1.703 +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
   1.704 +	  && { echo i486-ncr-sysv4; exit; } ;;
   1.705 +    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
   1.706 +	OS_REL='.3'
   1.707 +	test -r /etc/.relid \
   1.708 +	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
   1.709 +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
   1.710 +	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
   1.711 +	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
   1.712 +	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
   1.713 +	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
   1.714 +	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
   1.715      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
   1.716  	echo m68k-unknown-lynxos${UNAME_RELEASE}
   1.717  	exit ;;
   1.718 @@ -1136,7 +1125,7 @@
   1.719      rs6000:LynxOS:2.*:*)
   1.720  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
   1.721  	exit ;;
   1.722 -    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
   1.723 +    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
   1.724  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
   1.725  	exit ;;
   1.726      SM[BE]S:UNIX_SV:*:*)
   1.727 @@ -1156,10 +1145,10 @@
   1.728  		echo ns32k-sni-sysv
   1.729  	fi
   1.730  	exit ;;
   1.731 -    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
   1.732 -                      # says <Richard.M.Bartel@ccMail.Census.GOV>
   1.733 -        echo i586-unisys-sysv4
   1.734 -        exit ;;
   1.735 +    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
   1.736 +			# says <Richard.M.Bartel@ccMail.Census.GOV>
   1.737 +	echo i586-unisys-sysv4
   1.738 +	exit ;;
   1.739      *:UNIX_System_V:4*:FTX*)
   1.740  	# From Gerald Hewes <hewes@openmarket.com>.
   1.741  	# How about differentiating between stratus architectures? -djm
   1.742 @@ -1185,11 +1174,11 @@
   1.743  	exit ;;
   1.744      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
   1.745  	if [ -d /usr/nec ]; then
   1.746 -	        echo mips-nec-sysv${UNAME_RELEASE}
   1.747 +		echo mips-nec-sysv${UNAME_RELEASE}
   1.748  	else
   1.749 -	        echo mips-unknown-sysv${UNAME_RELEASE}
   1.750 +		echo mips-unknown-sysv${UNAME_RELEASE}
   1.751  	fi
   1.752 -        exit ;;
   1.753 +	exit ;;
   1.754      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
   1.755  	echo powerpc-be-beos
   1.756  	exit ;;
   1.757 @@ -1199,6 +1188,9 @@
   1.758      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
   1.759  	echo i586-pc-beos
   1.760  	exit ;;
   1.761 +    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
   1.762 +	echo i586-pc-haiku
   1.763 +	exit ;;
   1.764      SX-4:SUPER-UX:*:*)
   1.765  	echo sx4-nec-superux${UNAME_RELEASE}
   1.766  	exit ;;
   1.767 @@ -1208,6 +1200,15 @@
   1.768      SX-6:SUPER-UX:*:*)
   1.769  	echo sx6-nec-superux${UNAME_RELEASE}
   1.770  	exit ;;
   1.771 +    SX-7:SUPER-UX:*:*)
   1.772 +	echo sx7-nec-superux${UNAME_RELEASE}
   1.773 +	exit ;;
   1.774 +    SX-8:SUPER-UX:*:*)
   1.775 +	echo sx8-nec-superux${UNAME_RELEASE}
   1.776 +	exit ;;
   1.777 +    SX-8R:SUPER-UX:*:*)
   1.778 +	echo sx8r-nec-superux${UNAME_RELEASE}
   1.779 +	exit ;;
   1.780      Power*:Rhapsody:*:*)
   1.781  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
   1.782  	exit ;;
   1.783 @@ -1217,6 +1218,16 @@
   1.784      *:Darwin:*:*)
   1.785  	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
   1.786  	case $UNAME_PROCESSOR in
   1.787 +	    i386)
   1.788 +		eval $set_cc_for_build
   1.789 +		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
   1.790 +		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
   1.791 +		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
   1.792 +		      grep IS_64BIT_ARCH >/dev/null
   1.793 +		  then
   1.794 +		      UNAME_PROCESSOR="x86_64"
   1.795 +		  fi
   1.796 +		fi ;;
   1.797  	    unknown) UNAME_PROCESSOR=powerpc ;;
   1.798  	esac
   1.799  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
   1.800 @@ -1232,6 +1243,9 @@
   1.801      *:QNX:*:4*)
   1.802  	echo i386-pc-qnx
   1.803  	exit ;;
   1.804 +    NEO-?:NONSTOP_KERNEL:*:*)
   1.805 +	echo neo-tandem-nsk${UNAME_RELEASE}
   1.806 +	exit ;;
   1.807      NSE-?:NONSTOP_KERNEL:*:*)
   1.808  	echo nse-tandem-nsk${UNAME_RELEASE}
   1.809  	exit ;;
   1.810 @@ -1277,13 +1291,13 @@
   1.811  	echo pdp10-unknown-its
   1.812  	exit ;;
   1.813      SEI:*:*:SEIUX)
   1.814 -        echo mips-sei-seiux${UNAME_RELEASE}
   1.815 +	echo mips-sei-seiux${UNAME_RELEASE}
   1.816  	exit ;;
   1.817      *:DragonFly:*:*)
   1.818  	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   1.819  	exit ;;
   1.820      *:*VMS:*:*)
   1.821 -    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
   1.822 +	UNAME_MACHINE=`(uname -p) 2>/dev/null`
   1.823  	case "${UNAME_MACHINE}" in
   1.824  	    A*) echo alpha-dec-vms ; exit ;;
   1.825  	    I*) echo ia64-dec-vms ; exit ;;
   1.826 @@ -1298,6 +1312,9 @@
   1.827      i*86:rdos:*:*)
   1.828  	echo ${UNAME_MACHINE}-pc-rdos
   1.829  	exit ;;
   1.830 +    i*86:AROS:*:*)
   1.831 +	echo ${UNAME_MACHINE}-pc-aros
   1.832 +	exit ;;
   1.833  esac
   1.834  
   1.835  #echo '(No uname command or uname output not recognized.)' 1>&2
   1.836 @@ -1320,11 +1337,11 @@
   1.837  #include <sys/param.h>
   1.838    printf ("m68k-sony-newsos%s\n",
   1.839  #ifdef NEWSOS4
   1.840 -          "4"
   1.841 +	"4"
   1.842  #else
   1.843 -	  ""
   1.844 +	""
   1.845  #endif
   1.846 -         ); exit (0);
   1.847 +	); exit (0);
   1.848  #endif
   1.849  #endif
   1.850  
   1.851 @@ -1458,9 +1475,9 @@
   1.852  the operating system you are using. It is advised that you
   1.853  download the most up to date version of the config scripts from
   1.854  
   1.855 -  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
   1.856 +  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
   1.857  and
   1.858 -  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
   1.859 +  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
   1.860  
   1.861  If the version you run ($0) is already up to date, please
   1.862  send the following data and any information you think might be