config.guess
changeset 456 861128794ce2
parent 220 e59707061bde
child 498 af656a0a0fb5
     1.1 --- a/config.guess	Mon Jul 07 11:14:27 2014 -0700
     1.2 +++ b/config.guess	Mon Jul 07 11:15:49 2014 -0700
     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, 2007, 2008, 2009
     1.8 -#   Free Software Foundation, Inc.
     1.9 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
    1.10 +#   2011, 2012 Free Software Foundation, Inc.
    1.11  
    1.12 -timestamp='2009-09-18'
    1.13 +timestamp='2012-08-14'
    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 @@ -17,9 +17,7 @@
    1.18  # General Public License for more details.
    1.19  #
    1.20  # You should have received a copy of the GNU General Public License
    1.21 -# along with this program; if not, write to the Free Software
    1.22 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    1.23 -# 02110-1301, USA.
    1.24 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
    1.25  #
    1.26  # As a special exception to the GNU General Public License, if you
    1.27  # distribute this file as part of a program that contains a
    1.28 @@ -56,8 +54,9 @@
    1.29  GNU config.guess ($timestamp)
    1.30  
    1.31  Originally written by Per Bothner.
    1.32 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
    1.33 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    1.34 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    1.35 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
    1.36 +Free Software Foundation, Inc.
    1.37  
    1.38  This is free software; see the source for copying conditions.  There is NO
    1.39  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    1.40 @@ -144,7 +143,7 @@
    1.41  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    1.42      *:NetBSD:*:*)
    1.43  	# NetBSD (nbsd) targets should (where applicable) match one or
    1.44 -	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
    1.45 +	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
    1.46  	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
    1.47  	# switched to ELF, *-*-netbsd* would select the old
    1.48  	# object file format.  This provides both forward
    1.49 @@ -180,7 +179,7 @@
    1.50  		fi
    1.51  		;;
    1.52  	    *)
    1.53 -	        os=netbsd
    1.54 +		os=netbsd
    1.55  		;;
    1.56  	esac
    1.57  	# The OS release
    1.58 @@ -201,6 +200,10 @@
    1.59  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
    1.60  	echo "${machine}-${os}${release}"
    1.61  	exit ;;
    1.62 +    *:Bitrig:*:*)
    1.63 +	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
    1.64 +	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
    1.65 +	exit ;;
    1.66      *:OpenBSD:*:*)
    1.67  	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
    1.68  	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
    1.69 @@ -223,7 +226,7 @@
    1.70  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
    1.71  		;;
    1.72  	*5.*)
    1.73 -	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
    1.74 +		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
    1.75  		;;
    1.76  	esac
    1.77  	# According to Compaq, /usr/sbin/psrinfo has been available on
    1.78 @@ -269,7 +272,10 @@
    1.79  	# A Xn.n version is an unreleased experimental baselevel.
    1.80  	# 1.2 uses "1.2" for uname -r.
    1.81  	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    1.82 -	exit ;;
    1.83 +	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
    1.84 +	exitcode=$?
    1.85 +	trap '' 0
    1.86 +	exit $exitcode ;;
    1.87      Alpha\ *:Windows_NT*:*)
    1.88  	# How do we know it's Interix rather than the generic POSIX subsystem?
    1.89  	# Should we change UNAME_MACHINE based on the output of uname instead
    1.90 @@ -295,7 +301,7 @@
    1.91  	echo s390-ibm-zvmoe
    1.92  	exit ;;
    1.93      *:OS400:*:*)
    1.94 -        echo powerpc-ibm-os400
    1.95 +	echo powerpc-ibm-os400
    1.96  	exit ;;
    1.97      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
    1.98  	echo arm-acorn-riscix${UNAME_RELEASE}
    1.99 @@ -333,6 +339,9 @@
   1.100      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
   1.101  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.102  	exit ;;
   1.103 +    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
   1.104 +	echo i386-pc-auroraux${UNAME_RELEASE}
   1.105 +	exit ;;
   1.106      i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
   1.107  	eval $set_cc_for_build
   1.108  	SUN_ARCH="i386"
   1.109 @@ -391,23 +400,23 @@
   1.110      # MiNT.  But MiNT is downward compatible to TOS, so this should
   1.111      # be no problem.
   1.112      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
   1.113 -        echo m68k-atari-mint${UNAME_RELEASE}
   1.114 +	echo m68k-atari-mint${UNAME_RELEASE}
   1.115  	exit ;;
   1.116      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
   1.117  	echo m68k-atari-mint${UNAME_RELEASE}
   1.118 -        exit ;;
   1.119 +	exit ;;
   1.120      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
   1.121 -        echo m68k-atari-mint${UNAME_RELEASE}
   1.122 +	echo m68k-atari-mint${UNAME_RELEASE}
   1.123  	exit ;;
   1.124      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
   1.125 -        echo m68k-milan-mint${UNAME_RELEASE}
   1.126 -        exit ;;
   1.127 +	echo m68k-milan-mint${UNAME_RELEASE}
   1.128 +	exit ;;
   1.129      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
   1.130 -        echo m68k-hades-mint${UNAME_RELEASE}
   1.131 -        exit ;;
   1.132 +	echo m68k-hades-mint${UNAME_RELEASE}
   1.133 +	exit ;;
   1.134      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
   1.135 -        echo m68k-unknown-mint${UNAME_RELEASE}
   1.136 -        exit ;;
   1.137 +	echo m68k-unknown-mint${UNAME_RELEASE}
   1.138 +	exit ;;
   1.139      m68k:machten:*:*)
   1.140  	echo m68k-apple-machten${UNAME_RELEASE}
   1.141  	exit ;;
   1.142 @@ -477,8 +486,8 @@
   1.143  	echo m88k-motorola-sysv3
   1.144  	exit ;;
   1.145      AViiON:dgux:*:*)
   1.146 -        # DG/UX returns AViiON for all architectures
   1.147 -        UNAME_PROCESSOR=`/usr/bin/uname -p`
   1.148 +	# DG/UX returns AViiON for all architectures
   1.149 +	UNAME_PROCESSOR=`/usr/bin/uname -p`
   1.150  	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
   1.151  	then
   1.152  	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
   1.153 @@ -491,7 +500,7 @@
   1.154  	else
   1.155  	    echo i586-dg-dgux${UNAME_RELEASE}
   1.156  	fi
   1.157 - 	exit ;;
   1.158 +	exit ;;
   1.159      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
   1.160  	echo m88k-dolphin-sysv3
   1.161  	exit ;;
   1.162 @@ -548,7 +557,7 @@
   1.163  		echo rs6000-ibm-aix3.2
   1.164  	fi
   1.165  	exit ;;
   1.166 -    *:AIX:*:[456])
   1.167 +    *:AIX:*:[4567])
   1.168  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
   1.169  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
   1.170  		IBM_ARCH=rs6000
   1.171 @@ -591,52 +600,52 @@
   1.172  	    9000/[678][0-9][0-9])
   1.173  		if [ -x /usr/bin/getconf ]; then
   1.174  		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
   1.175 -                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
   1.176 -                    case "${sc_cpu_version}" in
   1.177 -                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
   1.178 -                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
   1.179 -                      532)                      # CPU_PA_RISC2_0
   1.180 -                        case "${sc_kernel_bits}" in
   1.181 -                          32) HP_ARCH="hppa2.0n" ;;
   1.182 -                          64) HP_ARCH="hppa2.0w" ;;
   1.183 +		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
   1.184 +		    case "${sc_cpu_version}" in
   1.185 +		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
   1.186 +		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
   1.187 +		      532)                      # CPU_PA_RISC2_0
   1.188 +			case "${sc_kernel_bits}" in
   1.189 +			  32) HP_ARCH="hppa2.0n" ;;
   1.190 +			  64) HP_ARCH="hppa2.0w" ;;
   1.191  			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
   1.192 -                        esac ;;
   1.193 -                    esac
   1.194 +			esac ;;
   1.195 +		    esac
   1.196  		fi
   1.197  		if [ "${HP_ARCH}" = "" ]; then
   1.198  		    eval $set_cc_for_build
   1.199 -		    sed 's/^              //' << EOF >$dummy.c
   1.200 +		    sed 's/^		//' << EOF >$dummy.c
   1.201  
   1.202 -              #define _HPUX_SOURCE
   1.203 -              #include <stdlib.h>
   1.204 -              #include <unistd.h>
   1.205 +		#define _HPUX_SOURCE
   1.206 +		#include <stdlib.h>
   1.207 +		#include <unistd.h>
   1.208  
   1.209 -              int main ()
   1.210 -              {
   1.211 -              #if defined(_SC_KERNEL_BITS)
   1.212 -                  long bits = sysconf(_SC_KERNEL_BITS);
   1.213 -              #endif
   1.214 -                  long cpu  = sysconf (_SC_CPU_VERSION);
   1.215 +		int main ()
   1.216 +		{
   1.217 +		#if defined(_SC_KERNEL_BITS)
   1.218 +		    long bits = sysconf(_SC_KERNEL_BITS);
   1.219 +		#endif
   1.220 +		    long cpu  = sysconf (_SC_CPU_VERSION);
   1.221  
   1.222 -                  switch (cpu)
   1.223 -              	{
   1.224 -              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
   1.225 -              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
   1.226 -              	case CPU_PA_RISC2_0:
   1.227 -              #if defined(_SC_KERNEL_BITS)
   1.228 -              	    switch (bits)
   1.229 -              		{
   1.230 -              		case 64: puts ("hppa2.0w"); break;
   1.231 -              		case 32: puts ("hppa2.0n"); break;
   1.232 -              		default: puts ("hppa2.0"); break;
   1.233 -              		} break;
   1.234 -              #else  /* !defined(_SC_KERNEL_BITS) */
   1.235 -              	    puts ("hppa2.0"); break;
   1.236 -              #endif
   1.237 -              	default: puts ("hppa1.0"); break;
   1.238 -              	}
   1.239 -                  exit (0);
   1.240 -              }
   1.241 +		    switch (cpu)
   1.242 +			{
   1.243 +			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
   1.244 +			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
   1.245 +			case CPU_PA_RISC2_0:
   1.246 +		#if defined(_SC_KERNEL_BITS)
   1.247 +			    switch (bits)
   1.248 +				{
   1.249 +				case 64: puts ("hppa2.0w"); break;
   1.250 +				case 32: puts ("hppa2.0n"); break;
   1.251 +				default: puts ("hppa2.0"); break;
   1.252 +				} break;
   1.253 +		#else  /* !defined(_SC_KERNEL_BITS) */
   1.254 +			    puts ("hppa2.0"); break;
   1.255 +		#endif
   1.256 +			default: puts ("hppa1.0"); break;
   1.257 +			}
   1.258 +		    exit (0);
   1.259 +		}
   1.260  EOF
   1.261  		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
   1.262  		    test -z "$HP_ARCH" && HP_ARCH=hppa
   1.263 @@ -727,22 +736,22 @@
   1.264  	exit ;;
   1.265      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
   1.266  	echo c1-convex-bsd
   1.267 -        exit ;;
   1.268 +	exit ;;
   1.269      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
   1.270  	if getsysinfo -f scalar_acc
   1.271  	then echo c32-convex-bsd
   1.272  	else echo c2-convex-bsd
   1.273  	fi
   1.274 -        exit ;;
   1.275 +	exit ;;
   1.276      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
   1.277  	echo c34-convex-bsd
   1.278 -        exit ;;
   1.279 +	exit ;;
   1.280      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
   1.281  	echo c38-convex-bsd
   1.282 -        exit ;;
   1.283 +	exit ;;
   1.284      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
   1.285  	echo c4-convex-bsd
   1.286 -        exit ;;
   1.287 +	exit ;;
   1.288      CRAY*Y-MP:*:*:*)
   1.289  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.290  	exit ;;
   1.291 @@ -766,14 +775,14 @@
   1.292  	exit ;;
   1.293      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
   1.294  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   1.295 -        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.296 -        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
   1.297 -        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.298 -        exit ;;
   1.299 +	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.300 +	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
   1.301 +	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.302 +	exit ;;
   1.303      5000:UNIX_System_V:4.*:*)
   1.304 -        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.305 -        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
   1.306 -        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.307 +	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.308 +	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
   1.309 +	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.310  	exit ;;
   1.311      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   1.312  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   1.313 @@ -785,34 +794,39 @@
   1.314  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   1.315  	exit ;;
   1.316      *:FreeBSD:*:*)
   1.317 -	case ${UNAME_MACHINE} in
   1.318 -	    pc98)
   1.319 -		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   1.320 +	UNAME_PROCESSOR=`/usr/bin/uname -p`
   1.321 +	case ${UNAME_PROCESSOR} in
   1.322  	    amd64)
   1.323  		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   1.324  	    *)
   1.325 -		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   1.326 +		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   1.327  	esac
   1.328  	exit ;;
   1.329      i*:CYGWIN*:*)
   1.330  	echo ${UNAME_MACHINE}-pc-cygwin
   1.331  	exit ;;
   1.332 +    *:MINGW64*:*)
   1.333 +	echo ${UNAME_MACHINE}-pc-mingw64
   1.334 +	exit ;;
   1.335      *:MINGW*:*)
   1.336  	echo ${UNAME_MACHINE}-pc-mingw32
   1.337  	exit ;;
   1.338 +    i*:MSYS*:*)
   1.339 +	echo ${UNAME_MACHINE}-pc-msys
   1.340 +	exit ;;
   1.341      i*:windows32*:*)
   1.342 -    	# uname -m includes "-pc" on this system.
   1.343 -    	echo ${UNAME_MACHINE}-mingw32
   1.344 +	# uname -m includes "-pc" on this system.
   1.345 +	echo ${UNAME_MACHINE}-mingw32
   1.346  	exit ;;
   1.347      i*:PW*:*)
   1.348  	echo ${UNAME_MACHINE}-pc-pw32
   1.349  	exit ;;
   1.350 -    *:Interix*:[3456]*)
   1.351 -    	case ${UNAME_MACHINE} in
   1.352 +    *:Interix*:*)
   1.353 +	case ${UNAME_MACHINE} in
   1.354  	    x86)
   1.355  		echo i586-pc-interix${UNAME_RELEASE}
   1.356  		exit ;;
   1.357 -	    EM64T | authenticamd | genuineintel)
   1.358 +	    authenticamd | genuineintel | EM64T)
   1.359  		echo x86_64-unknown-interix${UNAME_RELEASE}
   1.360  		exit ;;
   1.361  	    IA64)
   1.362 @@ -854,6 +868,13 @@
   1.363      i*86:Minix:*:*)
   1.364  	echo ${UNAME_MACHINE}-pc-minix
   1.365  	exit ;;
   1.366 +    aarch64:Linux:*:*)
   1.367 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.368 +	exit ;;
   1.369 +    aarch64_be:Linux:*:*)
   1.370 +	UNAME_MACHINE=aarch64_be
   1.371 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.372 +	exit ;;
   1.373      alpha:Linux:*:*)
   1.374  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
   1.375  	  EV5)   UNAME_MACHINE=alphaev5 ;;
   1.376 @@ -863,7 +884,7 @@
   1.377  	  EV6)   UNAME_MACHINE=alphaev6 ;;
   1.378  	  EV67)  UNAME_MACHINE=alphaev67 ;;
   1.379  	  EV68*) UNAME_MACHINE=alphaev68 ;;
   1.380 -        esac
   1.381 +	esac
   1.382  	objdump --private-headers /bin/sh | grep -q ld.so.1
   1.383  	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
   1.384  	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
   1.385 @@ -875,23 +896,44 @@
   1.386  	then
   1.387  	    echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.388  	else
   1.389 -	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
   1.390 +        case `sed -n '/^Hardware/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
   1.391 +        BCM2708) MANUFACTURER=raspberry;;
   1.392 +        *) MANUFACTURER=unknown;;
   1.393 +        esac
   1.394 +	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
   1.395 +		| grep -q __ARM_PCS_VFP
   1.396 +	    then
   1.397 +		echo ${UNAME_MACHINE}-${MANUFACTURER}-linux-gnueabi
   1.398 +	    else
   1.399 +		echo ${UNAME_MACHINE}-${MANUFACTURER}-linux-gnueabihf
   1.400 +	    fi
   1.401  	fi
   1.402  	exit ;;
   1.403      avr32*:Linux:*:*)
   1.404  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.405  	exit ;;
   1.406      cris:Linux:*:*)
   1.407 -	echo cris-axis-linux-gnu
   1.408 +	echo ${UNAME_MACHINE}-axis-linux-gnu
   1.409  	exit ;;
   1.410      crisv32:Linux:*:*)
   1.411 -	echo crisv32-axis-linux-gnu
   1.412 +	echo ${UNAME_MACHINE}-axis-linux-gnu
   1.413  	exit ;;
   1.414      frv:Linux:*:*)
   1.415 -    	echo frv-unknown-linux-gnu
   1.416 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.417 +	exit ;;
   1.418 +    hexagon:Linux:*:*)
   1.419 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.420  	exit ;;
   1.421      i*86:Linux:*:*)
   1.422 -	echo ${UNAME_MACHINE}-pc-linux-gnu
   1.423 +	LIBC=gnu
   1.424 +	eval $set_cc_for_build
   1.425 +	sed 's/^	//' << EOF >$dummy.c
   1.426 +	#ifdef __dietlibc__
   1.427 +	LIBC=dietlibc
   1.428 +	#endif
   1.429 +EOF
   1.430 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
   1.431 +	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
   1.432  	exit ;;
   1.433      ia64:Linux:*:*)
   1.434  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.435 @@ -918,15 +960,11 @@
   1.436  	#endif
   1.437  	#endif
   1.438  EOF
   1.439 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
   1.440 -	    /^CPU/{
   1.441 -		s: ::g
   1.442 -		p
   1.443 -	    }'`"
   1.444 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
   1.445  	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
   1.446  	;;
   1.447      or32:Linux:*:*)
   1.448 -	echo or32-unknown-linux-gnu
   1.449 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.450  	exit ;;
   1.451      padre:Linux:*:*)
   1.452  	echo sparc-unknown-linux-gnu
   1.453 @@ -952,7 +990,7 @@
   1.454  	echo ${UNAME_MACHINE}-ibm-linux
   1.455  	exit ;;
   1.456      sh64*:Linux:*:*)
   1.457 -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.458 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.459  	exit ;;
   1.460      sh*:Linux:*:*)
   1.461  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.462 @@ -960,14 +998,17 @@
   1.463      sparc:Linux:*:* | sparc64:Linux:*:*)
   1.464  	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.465  	exit ;;
   1.466 +    tile*:Linux:*:*)
   1.467 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.468 +	exit ;;
   1.469      vax:Linux:*:*)
   1.470  	echo ${UNAME_MACHINE}-dec-linux-gnu
   1.471  	exit ;;
   1.472      x86_64:Linux:*:*)
   1.473 -	echo x86_64-unknown-linux-gnu
   1.474 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.475  	exit ;;
   1.476      xtensa*:Linux:*:*)
   1.477 -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.478 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.479  	exit ;;
   1.480      i*86:DYNIX/ptx:4*:*)
   1.481  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
   1.482 @@ -976,11 +1017,11 @@
   1.483  	echo i386-sequent-sysv4
   1.484  	exit ;;
   1.485      i*86:UNIX_SV:4.2MP:2.*)
   1.486 -        # Unixware is an offshoot of SVR4, but it has its own version
   1.487 -        # number series starting with 2...
   1.488 -        # I am not positive that other SVR4 systems won't match this,
   1.489 +	# Unixware is an offshoot of SVR4, but it has its own version
   1.490 +	# number series starting with 2...
   1.491 +	# I am not positive that other SVR4 systems won't match this,
   1.492  	# I just have to hope.  -- rms.
   1.493 -        # Use sysv4.2uw... so that sysv4* matches it.
   1.494 +	# Use sysv4.2uw... so that sysv4* matches it.
   1.495  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
   1.496  	exit ;;
   1.497      i*86:OS/2:*:*)
   1.498 @@ -1012,7 +1053,7 @@
   1.499  	fi
   1.500  	exit ;;
   1.501      i*86:*:5:[678]*)
   1.502 -    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
   1.503 +	# UnixWare 7.x, OpenUNIX and OpenServer 6.
   1.504  	case `/bin/uname -X | grep "^Machine"` in
   1.505  	    *486*)	     UNAME_MACHINE=i486 ;;
   1.506  	    *Pentium)	     UNAME_MACHINE=i586 ;;
   1.507 @@ -1040,13 +1081,13 @@
   1.508  	exit ;;
   1.509      pc:*:*:*)
   1.510  	# Left here for compatibility:
   1.511 -        # uname -m prints for DJGPP always 'pc', but it prints nothing about
   1.512 -        # the processor, so we play safe by assuming i586.
   1.513 +	# uname -m prints for DJGPP always 'pc', but it prints nothing about
   1.514 +	# the processor, so we play safe by assuming i586.
   1.515  	# Note: whatever this is, it MUST be the same as what config.sub
   1.516  	# prints for the "djgpp" host, or else GDB configury will decide that
   1.517  	# this is a cross-build.
   1.518  	echo i586-pc-msdosdjgpp
   1.519 -        exit ;;
   1.520 +	exit ;;
   1.521      Intel:Mach:3*:*)
   1.522  	echo i386-pc-mach3
   1.523  	exit ;;
   1.524 @@ -1081,8 +1122,8 @@
   1.525  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
   1.526  	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
   1.527      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
   1.528 -        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
   1.529 -          && { echo i486-ncr-sysv4; exit; } ;;
   1.530 +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
   1.531 +	  && { echo i486-ncr-sysv4; exit; } ;;
   1.532      NCR*:*:4.2:* | MPRAS*:*:4.2:*)
   1.533  	OS_REL='.3'
   1.534  	test -r /etc/.relid \
   1.535 @@ -1125,10 +1166,10 @@
   1.536  		echo ns32k-sni-sysv
   1.537  	fi
   1.538  	exit ;;
   1.539 -    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
   1.540 -                      # says <Richard.M.Bartel@ccMail.Census.GOV>
   1.541 -        echo i586-unisys-sysv4
   1.542 -        exit ;;
   1.543 +    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
   1.544 +			# says <Richard.M.Bartel@ccMail.Census.GOV>
   1.545 +	echo i586-unisys-sysv4
   1.546 +	exit ;;
   1.547      *:UNIX_System_V:4*:FTX*)
   1.548  	# From Gerald Hewes <hewes@openmarket.com>.
   1.549  	# How about differentiating between stratus architectures? -djm
   1.550 @@ -1154,11 +1195,11 @@
   1.551  	exit ;;
   1.552      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
   1.553  	if [ -d /usr/nec ]; then
   1.554 -	        echo mips-nec-sysv${UNAME_RELEASE}
   1.555 +		echo mips-nec-sysv${UNAME_RELEASE}
   1.556  	else
   1.557 -	        echo mips-unknown-sysv${UNAME_RELEASE}
   1.558 +		echo mips-unknown-sysv${UNAME_RELEASE}
   1.559  	fi
   1.560 -        exit ;;
   1.561 +	exit ;;
   1.562      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
   1.563  	echo powerpc-be-beos
   1.564  	exit ;;
   1.565 @@ -1171,6 +1212,9 @@
   1.566      BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
   1.567  	echo i586-pc-haiku
   1.568  	exit ;;
   1.569 +    x86_64:Haiku:*:*)
   1.570 +	echo x86_64-unknown-haiku
   1.571 +	exit ;;
   1.572      SX-4:SUPER-UX:*:*)
   1.573  	echo sx4-nec-superux${UNAME_RELEASE}
   1.574  	exit ;;
   1.575 @@ -1223,7 +1267,10 @@
   1.576      *:QNX:*:4*)
   1.577  	echo i386-pc-qnx
   1.578  	exit ;;
   1.579 -    NSE-?:NONSTOP_KERNEL:*:*)
   1.580 +    NEO-?:NONSTOP_KERNEL:*:*)
   1.581 +	echo neo-tandem-nsk${UNAME_RELEASE}
   1.582 +	exit ;;
   1.583 +    NSE-*:NONSTOP_KERNEL:*:*)
   1.584  	echo nse-tandem-nsk${UNAME_RELEASE}
   1.585  	exit ;;
   1.586      NSR-?:NONSTOP_KERNEL:*:*)
   1.587 @@ -1268,13 +1315,13 @@
   1.588  	echo pdp10-unknown-its
   1.589  	exit ;;
   1.590      SEI:*:*:SEIUX)
   1.591 -        echo mips-sei-seiux${UNAME_RELEASE}
   1.592 +	echo mips-sei-seiux${UNAME_RELEASE}
   1.593  	exit ;;
   1.594      *:DragonFly:*:*)
   1.595  	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   1.596  	exit ;;
   1.597      *:*VMS:*:*)
   1.598 -    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
   1.599 +	UNAME_MACHINE=`(uname -p) 2>/dev/null`
   1.600  	case "${UNAME_MACHINE}" in
   1.601  	    A*) echo alpha-dec-vms ; exit ;;
   1.602  	    I*) echo ia64-dec-vms ; exit ;;
   1.603 @@ -1292,11 +1339,11 @@
   1.604      i*86:AROS:*:*)
   1.605  	echo ${UNAME_MACHINE}-pc-aros
   1.606  	exit ;;
   1.607 +    x86_64:VMkernel:*:*)
   1.608 +	echo ${UNAME_MACHINE}-unknown-esx
   1.609 +	exit ;;
   1.610  esac
   1.611  
   1.612 -#echo '(No uname command or uname output not recognized.)' 1>&2
   1.613 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
   1.614 -
   1.615  eval $set_cc_for_build
   1.616  cat >$dummy.c <<EOF
   1.617  #ifdef _SEQUENT_
   1.618 @@ -1314,11 +1361,11 @@
   1.619  #include <sys/param.h>
   1.620    printf ("m68k-sony-newsos%s\n",
   1.621  #ifdef NEWSOS4
   1.622 -          "4"
   1.623 +	"4"
   1.624  #else
   1.625 -	  ""
   1.626 +	""
   1.627  #endif
   1.628 -         ); exit (0);
   1.629 +	); exit (0);
   1.630  #endif
   1.631  #endif
   1.632