build-scripts/config.guess
changeset 11477 6987f7cb0a22
parent 9547 208ccaf7b64c
     1.1 --- a/build-scripts/config.guess	Sat Sep 09 07:45:31 2017 -0700
     1.2 +++ b/build-scripts/config.guess	Sat Sep 09 08:03:23 2017 -0700
     1.3 @@ -1,14 +1,12 @@
     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, 2010,
     1.8 -#   2011, 2012 Free Software Foundation, Inc.
     1.9 +#   Copyright 1992-2017 Free Software Foundation, Inc.
    1.10  
    1.11 -timestamp='2012-08-14'
    1.12 +timestamp='2017-08-08'
    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 -# the Free Software Foundation; either version 2 of the License, or
    1.17 +# the Free Software Foundation; either version 3 of the License, or
    1.18  # (at your option) any later version.
    1.19  #
    1.20  # This program is distributed in the hope that it will be useful, but
    1.21 @@ -22,19 +20,17 @@
    1.22  # As a special exception to the GNU General Public License, if you
    1.23  # distribute this file as part of a program that contains a
    1.24  # configuration script generated by Autoconf, you may include it under
    1.25 -# the same distribution terms that you use for the rest of that program.
    1.26 -
    1.27 -
    1.28 -# Originally written by Per Bothner.  Please send patches (context
    1.29 -# diff format) to <config-patches@gnu.org> and include a ChangeLog
    1.30 -# entry.
    1.31 +# the same distribution terms that you use for the rest of that
    1.32 +# program.  This Exception is an additional permission under section 7
    1.33 +# of the GNU General Public License, version 3 ("GPLv3").
    1.34  #
    1.35 -# This script attempts to guess a canonical system name similar to
    1.36 -# config.sub.  If it succeeds, it prints the system name on stdout, and
    1.37 -# exits with 0.  Otherwise, it exits with 1.
    1.38 +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
    1.39  #
    1.40  # You can get the latest version of this script from:
    1.41 -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
    1.42 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
    1.43 +#
    1.44 +# Please send patches to <config-patches@gnu.org>.
    1.45 +
    1.46  
    1.47  me=`echo "$0" | sed -e 's,.*/,,'`
    1.48  
    1.49 @@ -54,9 +50,7 @@
    1.50  GNU config.guess ($timestamp)
    1.51  
    1.52  Originally written by Per Bothner.
    1.53 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    1.54 -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
    1.55 -Free Software Foundation, Inc.
    1.56 +Copyright 1992-2017 Free Software Foundation, Inc.
    1.57  
    1.58  This is free software; see the source for copying conditions.  There is NO
    1.59  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    1.60 @@ -138,6 +132,27 @@
    1.61  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
    1.62  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
    1.63  
    1.64 +case "${UNAME_SYSTEM}" in
    1.65 +Linux|GNU|GNU/*)
    1.66 +	# If the system lacks a compiler, then just pick glibc.
    1.67 +	# We could probably try harder.
    1.68 +	LIBC=gnu
    1.69 +
    1.70 +	eval $set_cc_for_build
    1.71 +	cat <<-EOF > $dummy.c
    1.72 +	#include <features.h>
    1.73 +	#if defined(__UCLIBC__)
    1.74 +	LIBC=uclibc
    1.75 +	#elif defined(__dietlibc__)
    1.76 +	LIBC=dietlibc
    1.77 +	#else
    1.78 +	LIBC=gnu
    1.79 +	#endif
    1.80 +	EOF
    1.81 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
    1.82 +	;;
    1.83 +esac
    1.84 +
    1.85  # Note: order is significant - the case branches are not exclusive.
    1.86  
    1.87  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    1.88 @@ -153,19 +168,29 @@
    1.89  	# Note: NetBSD doesn't particularly care about the vendor
    1.90  	# portion of the name.  We always set it to "unknown".
    1.91  	sysctl="sysctl -n hw.machine_arch"
    1.92 -	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
    1.93 -	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
    1.94 +	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
    1.95 +	    /sbin/$sysctl 2>/dev/null || \
    1.96 +	    /usr/sbin/$sysctl 2>/dev/null || \
    1.97 +	    echo unknown)`
    1.98  	case "${UNAME_MACHINE_ARCH}" in
    1.99  	    armeb) machine=armeb-unknown ;;
   1.100  	    arm*) machine=arm-unknown ;;
   1.101  	    sh3el) machine=shl-unknown ;;
   1.102  	    sh3eb) machine=sh-unknown ;;
   1.103  	    sh5el) machine=sh5le-unknown ;;
   1.104 +	    earmv*)
   1.105 +		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
   1.106 +		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
   1.107 +		machine=${arch}${endian}-unknown
   1.108 +		;;
   1.109  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
   1.110  	esac
   1.111  	# The Operating System including object format, if it has switched
   1.112 -	# to ELF recently, or will in the future.
   1.113 +	# to ELF recently (or will in the future) and ABI.
   1.114  	case "${UNAME_MACHINE_ARCH}" in
   1.115 +	    earm*)
   1.116 +		os=netbsdelf
   1.117 +		;;
   1.118  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
   1.119  		eval $set_cc_for_build
   1.120  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
   1.121 @@ -182,6 +207,13 @@
   1.122  		os=netbsd
   1.123  		;;
   1.124  	esac
   1.125 +	# Determine ABI tags.
   1.126 +	case "${UNAME_MACHINE_ARCH}" in
   1.127 +	    earm*)
   1.128 +		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
   1.129 +		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
   1.130 +		;;
   1.131 +	esac
   1.132  	# The OS release
   1.133  	# Debian GNU/NetBSD machines have a different userland, and
   1.134  	# thus, need a distinct triplet. However, they do not need
   1.135 @@ -192,13 +224,13 @@
   1.136  		release='-gnu'
   1.137  		;;
   1.138  	    *)
   1.139 -		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   1.140 +		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
   1.141  		;;
   1.142  	esac
   1.143  	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
   1.144  	# contains redundant information, the shorter form:
   1.145  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
   1.146 -	echo "${machine}-${os}${release}"
   1.147 +	echo "${machine}-${os}${release}${abi}"
   1.148  	exit ;;
   1.149      *:Bitrig:*:*)
   1.150  	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
   1.151 @@ -208,6 +240,10 @@
   1.152  	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
   1.153  	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
   1.154  	exit ;;
   1.155 +    *:LibertyBSD:*:*)
   1.156 +	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
   1.157 +	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
   1.158 +	exit ;;
   1.159      *:ekkoBSD:*:*)
   1.160  	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
   1.161  	exit ;;
   1.162 @@ -220,6 +256,12 @@
   1.163      *:MirBSD:*:*)
   1.164  	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
   1.165  	exit ;;
   1.166 +    *:Sortix:*:*)
   1.167 +	echo ${UNAME_MACHINE}-unknown-sortix
   1.168 +	exit ;;
   1.169 +    *:Redox:*:*)
   1.170 +	echo ${UNAME_MACHINE}-unknown-redox
   1.171 +	exit ;;
   1.172      alpha:OSF1:*:*)
   1.173  	case $UNAME_RELEASE in
   1.174  	*4.0)
   1.175 @@ -236,42 +278,42 @@
   1.176  	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
   1.177  	case "$ALPHA_CPU_TYPE" in
   1.178  	    "EV4 (21064)")
   1.179 -		UNAME_MACHINE="alpha" ;;
   1.180 +		UNAME_MACHINE=alpha ;;
   1.181  	    "EV4.5 (21064)")
   1.182 -		UNAME_MACHINE="alpha" ;;
   1.183 +		UNAME_MACHINE=alpha ;;
   1.184  	    "LCA4 (21066/21068)")
   1.185 -		UNAME_MACHINE="alpha" ;;
   1.186 +		UNAME_MACHINE=alpha ;;
   1.187  	    "EV5 (21164)")
   1.188 -		UNAME_MACHINE="alphaev5" ;;
   1.189 +		UNAME_MACHINE=alphaev5 ;;
   1.190  	    "EV5.6 (21164A)")
   1.191 -		UNAME_MACHINE="alphaev56" ;;
   1.192 +		UNAME_MACHINE=alphaev56 ;;
   1.193  	    "EV5.6 (21164PC)")
   1.194 -		UNAME_MACHINE="alphapca56" ;;
   1.195 +		UNAME_MACHINE=alphapca56 ;;
   1.196  	    "EV5.7 (21164PC)")
   1.197 -		UNAME_MACHINE="alphapca57" ;;
   1.198 +		UNAME_MACHINE=alphapca57 ;;
   1.199  	    "EV6 (21264)")
   1.200 -		UNAME_MACHINE="alphaev6" ;;
   1.201 +		UNAME_MACHINE=alphaev6 ;;
   1.202  	    "EV6.7 (21264A)")
   1.203 -		UNAME_MACHINE="alphaev67" ;;
   1.204 +		UNAME_MACHINE=alphaev67 ;;
   1.205  	    "EV6.8CB (21264C)")
   1.206 -		UNAME_MACHINE="alphaev68" ;;
   1.207 +		UNAME_MACHINE=alphaev68 ;;
   1.208  	    "EV6.8AL (21264B)")
   1.209 -		UNAME_MACHINE="alphaev68" ;;
   1.210 +		UNAME_MACHINE=alphaev68 ;;
   1.211  	    "EV6.8CX (21264D)")
   1.212 -		UNAME_MACHINE="alphaev68" ;;
   1.213 +		UNAME_MACHINE=alphaev68 ;;
   1.214  	    "EV6.9A (21264/EV69A)")
   1.215 -		UNAME_MACHINE="alphaev69" ;;
   1.216 +		UNAME_MACHINE=alphaev69 ;;
   1.217  	    "EV7 (21364)")
   1.218 -		UNAME_MACHINE="alphaev7" ;;
   1.219 +		UNAME_MACHINE=alphaev7 ;;
   1.220  	    "EV7.9 (21364A)")
   1.221 -		UNAME_MACHINE="alphaev79" ;;
   1.222 +		UNAME_MACHINE=alphaev79 ;;
   1.223  	esac
   1.224  	# A Pn.n version is a patched version.
   1.225  	# A Vn.n version is a released version.
   1.226  	# A Tn.n version is a released field test version.
   1.227  	# A Xn.n version is an unreleased experimental baselevel.
   1.228  	# 1.2 uses "1.2" for uname -r.
   1.229 -	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   1.230 +	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
   1.231  	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
   1.232  	exitcode=$?
   1.233  	trap '' 0
   1.234 @@ -306,7 +348,7 @@
   1.235      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   1.236  	echo arm-acorn-riscix${UNAME_RELEASE}
   1.237  	exit ;;
   1.238 -    arm:riscos:*:*|arm:RISCOS:*:*)
   1.239 +    arm*:riscos:*:*|arm*:RISCOS:*:*)
   1.240  	echo arm-unknown-riscos
   1.241  	exit ;;
   1.242      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
   1.243 @@ -344,16 +386,16 @@
   1.244  	exit ;;
   1.245      i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
   1.246  	eval $set_cc_for_build
   1.247 -	SUN_ARCH="i386"
   1.248 +	SUN_ARCH=i386
   1.249  	# If there is a compiler, see if it is configured for 64-bit objects.
   1.250  	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
   1.251  	# This test works for both compilers.
   1.252 -	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
   1.253 +	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
   1.254  	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
   1.255 -		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
   1.256 +		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
   1.257  		grep IS_64BIT_ARCH >/dev/null
   1.258  	    then
   1.259 -		SUN_ARCH="x86_64"
   1.260 +		SUN_ARCH=x86_64
   1.261  	    fi
   1.262  	fi
   1.263  	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   1.264 @@ -378,7 +420,7 @@
   1.265  	exit ;;
   1.266      sun*:*:4.2BSD:*)
   1.267  	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
   1.268 -	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
   1.269 +	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
   1.270  	case "`/bin/arch`" in
   1.271  	    sun3)
   1.272  		echo m68k-sun-sunos${UNAME_RELEASE}
   1.273 @@ -564,8 +606,9 @@
   1.274  	else
   1.275  		IBM_ARCH=powerpc
   1.276  	fi
   1.277 -	if [ -x /usr/bin/oslevel ] ; then
   1.278 -		IBM_REV=`/usr/bin/oslevel`
   1.279 +	if [ -x /usr/bin/lslpp ] ; then
   1.280 +		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
   1.281 +			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
   1.282  	else
   1.283  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
   1.284  	fi
   1.285 @@ -602,13 +645,13 @@
   1.286  		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
   1.287  		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
   1.288  		    case "${sc_cpu_version}" in
   1.289 -		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
   1.290 -		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
   1.291 +		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
   1.292 +		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
   1.293  		      532)                      # CPU_PA_RISC2_0
   1.294  			case "${sc_kernel_bits}" in
   1.295 -			  32) HP_ARCH="hppa2.0n" ;;
   1.296 -			  64) HP_ARCH="hppa2.0w" ;;
   1.297 -			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
   1.298 +			  32) HP_ARCH=hppa2.0n ;;
   1.299 +			  64) HP_ARCH=hppa2.0w ;;
   1.300 +			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
   1.301  			esac ;;
   1.302  		    esac
   1.303  		fi
   1.304 @@ -647,11 +690,11 @@
   1.305  		    exit (0);
   1.306  		}
   1.307  EOF
   1.308 -		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
   1.309 +		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
   1.310  		    test -z "$HP_ARCH" && HP_ARCH=hppa
   1.311  		fi ;;
   1.312  	esac
   1.313 -	if [ ${HP_ARCH} = "hppa2.0w" ]
   1.314 +	if [ ${HP_ARCH} = hppa2.0w ]
   1.315  	then
   1.316  	    eval $set_cc_for_build
   1.317  
   1.318 @@ -664,12 +707,12 @@
   1.319  	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
   1.320  	    # => hppa64-hp-hpux11.23
   1.321  
   1.322 -	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
   1.323 +	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
   1.324  		grep -q __LP64__
   1.325  	    then
   1.326 -		HP_ARCH="hppa2.0w"
   1.327 +		HP_ARCH=hppa2.0w
   1.328  	    else
   1.329 -		HP_ARCH="hppa64"
   1.330 +		HP_ARCH=hppa64
   1.331  	    fi
   1.332  	fi
   1.333  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
   1.334 @@ -774,14 +817,14 @@
   1.335  	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.336  	exit ;;
   1.337      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
   1.338 -	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   1.339 -	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.340 +	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
   1.341 +	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
   1.342  	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
   1.343  	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.344  	exit ;;
   1.345      5000:UNIX_System_V:4.*:*)
   1.346 -	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.347 -	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
   1.348 +	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
   1.349 +	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
   1.350  	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.351  	exit ;;
   1.352      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   1.353 @@ -797,10 +840,11 @@
   1.354  	UNAME_PROCESSOR=`/usr/bin/uname -p`
   1.355  	case ${UNAME_PROCESSOR} in
   1.356  	    amd64)
   1.357 -		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   1.358 -	    *)
   1.359 -		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   1.360 +		UNAME_PROCESSOR=x86_64 ;;
   1.361 +	    i386)
   1.362 +		UNAME_PROCESSOR=i586 ;;
   1.363  	esac
   1.364 +	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   1.365  	exit ;;
   1.366      i*:CYGWIN*:*)
   1.367  	echo ${UNAME_MACHINE}-pc-cygwin
   1.368 @@ -811,7 +855,7 @@
   1.369      *:MINGW*:*)
   1.370  	echo ${UNAME_MACHINE}-pc-mingw32
   1.371  	exit ;;
   1.372 -    i*:MSYS*:*)
   1.373 +    *:MSYS*:*)
   1.374  	echo ${UNAME_MACHINE}-pc-msys
   1.375  	exit ;;
   1.376      i*:windows32*:*)
   1.377 @@ -859,21 +903,21 @@
   1.378  	exit ;;
   1.379      *:GNU:*:*)
   1.380  	# the GNU system
   1.381 -	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
   1.382 +	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
   1.383  	exit ;;
   1.384      *:GNU/*:*:*)
   1.385  	# other systems with GNU libc and userland
   1.386 -	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
   1.387 +	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
   1.388  	exit ;;
   1.389      i*86:Minix:*:*)
   1.390  	echo ${UNAME_MACHINE}-pc-minix
   1.391  	exit ;;
   1.392      aarch64:Linux:*:*)
   1.393 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.394 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.395  	exit ;;
   1.396      aarch64_be:Linux:*:*)
   1.397  	UNAME_MACHINE=aarch64_be
   1.398 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.399 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.400  	exit ;;
   1.401      alpha:Linux:*:*)
   1.402  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
   1.403 @@ -886,64 +930,60 @@
   1.404  	  EV68*) UNAME_MACHINE=alphaev68 ;;
   1.405  	esac
   1.406  	objdump --private-headers /bin/sh | grep -q ld.so.1
   1.407 -	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
   1.408 -	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
   1.409 +	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
   1.410 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.411 +	exit ;;
   1.412 +    arc:Linux:*:* | arceb:Linux:*:*)
   1.413 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.414  	exit ;;
   1.415      arm*:Linux:*:*)
   1.416  	eval $set_cc_for_build
   1.417  	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
   1.418  	    | grep -q __ARM_EABI__
   1.419  	then
   1.420 -	    echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.421 +	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.422  	else
   1.423 -        case `sed -n '/^Hardware/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
   1.424 -        BCM2708) MANUFACTURER=raspberry;;
   1.425 -        BCM2709) MANUFACTURER=raspberry;;
   1.426 -        *) MANUFACTURER=unknown;;
   1.427 -        esac
   1.428  	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
   1.429  		| grep -q __ARM_PCS_VFP
   1.430  	    then
   1.431 -		echo ${UNAME_MACHINE}-${MANUFACTURER}-linux-gnueabi
   1.432 +		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
   1.433  	    else
   1.434 -		echo ${UNAME_MACHINE}-${MANUFACTURER}-linux-gnueabihf
   1.435 +		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
   1.436  	    fi
   1.437  	fi
   1.438  	exit ;;
   1.439      avr32*:Linux:*:*)
   1.440 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.441 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.442  	exit ;;
   1.443      cris:Linux:*:*)
   1.444 -	echo ${UNAME_MACHINE}-axis-linux-gnu
   1.445 +	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
   1.446  	exit ;;
   1.447      crisv32:Linux:*:*)
   1.448 -	echo ${UNAME_MACHINE}-axis-linux-gnu
   1.449 +	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
   1.450 +	exit ;;
   1.451 +    e2k:Linux:*:*)
   1.452 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.453  	exit ;;
   1.454      frv:Linux:*:*)
   1.455 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.456 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.457  	exit ;;
   1.458      hexagon:Linux:*:*)
   1.459 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.460 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.461  	exit ;;
   1.462      i*86:Linux:*:*)
   1.463 -	LIBC=gnu
   1.464 -	eval $set_cc_for_build
   1.465 -	sed 's/^	//' << EOF >$dummy.c
   1.466 -	#ifdef __dietlibc__
   1.467 -	LIBC=dietlibc
   1.468 -	#endif
   1.469 -EOF
   1.470 -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
   1.471 -	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
   1.472 +	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
   1.473  	exit ;;
   1.474      ia64:Linux:*:*)
   1.475 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.476 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.477 +	exit ;;
   1.478 +    k1om:Linux:*:*)
   1.479 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.480  	exit ;;
   1.481      m32r*:Linux:*:*)
   1.482 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.483 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.484  	exit ;;
   1.485      m68*:Linux:*:*)
   1.486 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.487 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.488  	exit ;;
   1.489      mips:Linux:*:* | mips64:Linux:*:*)
   1.490  	eval $set_cc_for_build
   1.491 @@ -962,54 +1002,69 @@
   1.492  	#endif
   1.493  EOF
   1.494  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
   1.495 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
   1.496 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
   1.497  	;;
   1.498 -    or32:Linux:*:*)
   1.499 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.500 +    mips64el:Linux:*:*)
   1.501 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.502 +	exit ;;
   1.503 +    openrisc*:Linux:*:*)
   1.504 +	echo or1k-unknown-linux-${LIBC}
   1.505 +	exit ;;
   1.506 +    or32:Linux:*:* | or1k*:Linux:*:*)
   1.507 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.508  	exit ;;
   1.509      padre:Linux:*:*)
   1.510 -	echo sparc-unknown-linux-gnu
   1.511 +	echo sparc-unknown-linux-${LIBC}
   1.512  	exit ;;
   1.513      parisc64:Linux:*:* | hppa64:Linux:*:*)
   1.514 -	echo hppa64-unknown-linux-gnu
   1.515 +	echo hppa64-unknown-linux-${LIBC}
   1.516  	exit ;;
   1.517      parisc:Linux:*:* | hppa:Linux:*:*)
   1.518  	# Look for CPU level
   1.519  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
   1.520 -	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
   1.521 -	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
   1.522 -	  *)    echo hppa-unknown-linux-gnu ;;
   1.523 +	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
   1.524 +	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
   1.525 +	  *)    echo hppa-unknown-linux-${LIBC} ;;
   1.526  	esac
   1.527  	exit ;;
   1.528      ppc64:Linux:*:*)
   1.529 -	echo powerpc64-unknown-linux-gnu
   1.530 +	echo powerpc64-unknown-linux-${LIBC}
   1.531  	exit ;;
   1.532      ppc:Linux:*:*)
   1.533 -	echo powerpc-unknown-linux-gnu
   1.534 +	echo powerpc-unknown-linux-${LIBC}
   1.535 +	exit ;;
   1.536 +    ppc64le:Linux:*:*)
   1.537 +	echo powerpc64le-unknown-linux-${LIBC}
   1.538 +	exit ;;
   1.539 +    ppcle:Linux:*:*)
   1.540 +	echo powerpcle-unknown-linux-${LIBC}
   1.541 +	exit ;;
   1.542 +    riscv32:Linux:*:* | riscv64:Linux:*:*)
   1.543 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.544  	exit ;;
   1.545      s390:Linux:*:* | s390x:Linux:*:*)
   1.546 -	echo ${UNAME_MACHINE}-ibm-linux
   1.547 +	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
   1.548  	exit ;;
   1.549      sh64*:Linux:*:*)
   1.550 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.551 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.552  	exit ;;
   1.553      sh*:Linux:*:*)
   1.554 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.555 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.556  	exit ;;
   1.557      sparc:Linux:*:* | sparc64:Linux:*:*)
   1.558 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.559 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.560  	exit ;;
   1.561      tile*:Linux:*:*)
   1.562 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.563 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.564  	exit ;;
   1.565      vax:Linux:*:*)
   1.566 -	echo ${UNAME_MACHINE}-dec-linux-gnu
   1.567 +	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
   1.568  	exit ;;
   1.569      x86_64:Linux:*:*)
   1.570 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.571 +	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
   1.572  	exit ;;
   1.573      xtensa*:Linux:*:*)
   1.574 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.575 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   1.576  	exit ;;
   1.577      i*86:DYNIX/ptx:4*:*)
   1.578  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
   1.579 @@ -1085,7 +1140,7 @@
   1.580  	# uname -m prints for DJGPP always 'pc', but it prints nothing about
   1.581  	# the processor, so we play safe by assuming i586.
   1.582  	# Note: whatever this is, it MUST be the same as what config.sub
   1.583 -	# prints for the "djgpp" host, or else GDB configury will decide that
   1.584 +	# prints for the "djgpp" host, or else GDB configure will decide that
   1.585  	# this is a cross-build.
   1.586  	echo i586-pc-msdosdjgpp
   1.587  	exit ;;
   1.588 @@ -1234,6 +1289,9 @@
   1.589      SX-8R:SUPER-UX:*:*)
   1.590  	echo sx8r-nec-superux${UNAME_RELEASE}
   1.591  	exit ;;
   1.592 +    SX-ACE:SUPER-UX:*:*)
   1.593 +	echo sxace-nec-superux${UNAME_RELEASE}
   1.594 +	exit ;;
   1.595      Power*:Rhapsody:*:*)
   1.596  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
   1.597  	exit ;;
   1.598 @@ -1242,24 +1300,43 @@
   1.599  	exit ;;
   1.600      *:Darwin:*:*)
   1.601  	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
   1.602 -	case $UNAME_PROCESSOR in
   1.603 -	    i386)
   1.604 -		eval $set_cc_for_build
   1.605 -		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
   1.606 -		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
   1.607 -		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
   1.608 -		      grep IS_64BIT_ARCH >/dev/null
   1.609 -		  then
   1.610 -		      UNAME_PROCESSOR="x86_64"
   1.611 -		  fi
   1.612 -		fi ;;
   1.613 -	    unknown) UNAME_PROCESSOR=powerpc ;;
   1.614 -	esac
   1.615 +	eval $set_cc_for_build
   1.616 +	if test "$UNAME_PROCESSOR" = unknown ; then
   1.617 +	    UNAME_PROCESSOR=powerpc
   1.618 +	fi
   1.619 +	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
   1.620 +	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
   1.621 +		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
   1.622 +		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
   1.623 +		       grep IS_64BIT_ARCH >/dev/null
   1.624 +		then
   1.625 +		    case $UNAME_PROCESSOR in
   1.626 +			i386) UNAME_PROCESSOR=x86_64 ;;
   1.627 +			powerpc) UNAME_PROCESSOR=powerpc64 ;;
   1.628 +		    esac
   1.629 +		fi
   1.630 +		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
   1.631 +		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
   1.632 +		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
   1.633 +		       grep IS_PPC >/dev/null
   1.634 +		then
   1.635 +		    UNAME_PROCESSOR=powerpc
   1.636 +		fi
   1.637 +	    fi
   1.638 +	elif test "$UNAME_PROCESSOR" = i386 ; then
   1.639 +	    # Avoid executing cc on OS X 10.9, as it ships with a stub
   1.640 +	    # that puts up a graphical alert prompting to install
   1.641 +	    # developer tools.  Any system running Mac OS X 10.7 or
   1.642 +	    # later (Darwin 11 and later) is required to have a 64-bit
   1.643 +	    # processor. This is not true of the ARM version of Darwin
   1.644 +	    # that Apple uses in portable devices.
   1.645 +	    UNAME_PROCESSOR=x86_64
   1.646 +	fi
   1.647  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
   1.648  	exit ;;
   1.649      *:procnto*:*:* | *:QNX:[0123456789]*:*)
   1.650  	UNAME_PROCESSOR=`uname -p`
   1.651 -	if test "$UNAME_PROCESSOR" = "x86"; then
   1.652 +	if test "$UNAME_PROCESSOR" = x86; then
   1.653  		UNAME_PROCESSOR=i386
   1.654  		UNAME_MACHINE=pc
   1.655  	fi
   1.656 @@ -1268,15 +1345,18 @@
   1.657      *:QNX:*:4*)
   1.658  	echo i386-pc-qnx
   1.659  	exit ;;
   1.660 -    NEO-?:NONSTOP_KERNEL:*:*)
   1.661 +    NEO-*:NONSTOP_KERNEL:*:*)
   1.662  	echo neo-tandem-nsk${UNAME_RELEASE}
   1.663  	exit ;;
   1.664      NSE-*:NONSTOP_KERNEL:*:*)
   1.665  	echo nse-tandem-nsk${UNAME_RELEASE}
   1.666  	exit ;;
   1.667 -    NSR-?:NONSTOP_KERNEL:*:*)
   1.668 +    NSR-*:NONSTOP_KERNEL:*:*)
   1.669  	echo nsr-tandem-nsk${UNAME_RELEASE}
   1.670  	exit ;;
   1.671 +    NSX-*:NONSTOP_KERNEL:*:*)
   1.672 +	echo nsx-tandem-nsk${UNAME_RELEASE}
   1.673 +	exit ;;
   1.674      *:NonStop-UX:*:*)
   1.675  	echo mips-compaq-nonstopux
   1.676  	exit ;;
   1.677 @@ -1290,7 +1370,7 @@
   1.678  	# "uname -m" is not consistent, so use $cputype instead. 386
   1.679  	# is converted to i386 for consistency with other x86
   1.680  	# operating systems.
   1.681 -	if test "$cputype" = "386"; then
   1.682 +	if test "$cputype" = 386; then
   1.683  	    UNAME_MACHINE=i386
   1.684  	else
   1.685  	    UNAME_MACHINE="$cputype"
   1.686 @@ -1332,7 +1412,7 @@
   1.687  	echo i386-pc-xenix
   1.688  	exit ;;
   1.689      i*86:skyos:*:*)
   1.690 -	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
   1.691 +	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
   1.692  	exit ;;
   1.693      i*86:rdos:*:*)
   1.694  	echo ${UNAME_MACHINE}-pc-rdos
   1.695 @@ -1343,171 +1423,25 @@
   1.696      x86_64:VMkernel:*:*)
   1.697  	echo ${UNAME_MACHINE}-unknown-esx
   1.698  	exit ;;
   1.699 +    amd64:Isilon\ OneFS:*:*)
   1.700 +	echo x86_64-unknown-onefs
   1.701 +	exit ;;
   1.702  esac
   1.703  
   1.704 -eval $set_cc_for_build
   1.705 -cat >$dummy.c <<EOF
   1.706 -#ifdef _SEQUENT_
   1.707 -# include <sys/types.h>
   1.708 -# include <sys/utsname.h>
   1.709 -#endif
   1.710 -main ()
   1.711 -{
   1.712 -#if defined (sony)
   1.713 -#if defined (MIPSEB)
   1.714 -  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
   1.715 -     I don't know....  */
   1.716 -  printf ("mips-sony-bsd\n"); exit (0);
   1.717 -#else
   1.718 -#include <sys/param.h>
   1.719 -  printf ("m68k-sony-newsos%s\n",
   1.720 -#ifdef NEWSOS4
   1.721 -	"4"
   1.722 -#else
   1.723 -	""
   1.724 -#endif
   1.725 -	); exit (0);
   1.726 -#endif
   1.727 -#endif
   1.728 -
   1.729 -#if defined (__arm) && defined (__acorn) && defined (__unix)
   1.730 -  printf ("arm-acorn-riscix\n"); exit (0);
   1.731 -#endif
   1.732 -
   1.733 -#if defined (hp300) && !defined (hpux)
   1.734 -  printf ("m68k-hp-bsd\n"); exit (0);
   1.735 -#endif
   1.736 -
   1.737 -#if defined (NeXT)
   1.738 -#if !defined (__ARCHITECTURE__)
   1.739 -#define __ARCHITECTURE__ "m68k"
   1.740 -#endif
   1.741 -  int version;
   1.742 -  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
   1.743 -  if (version < 4)
   1.744 -    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
   1.745 -  else
   1.746 -    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
   1.747 -  exit (0);
   1.748 -#endif
   1.749 -
   1.750 -#if defined (MULTIMAX) || defined (n16)
   1.751 -#if defined (UMAXV)
   1.752 -  printf ("ns32k-encore-sysv\n"); exit (0);
   1.753 -#else
   1.754 -#if defined (CMU)
   1.755 -  printf ("ns32k-encore-mach\n"); exit (0);
   1.756 -#else
   1.757 -  printf ("ns32k-encore-bsd\n"); exit (0);
   1.758 -#endif
   1.759 -#endif
   1.760 -#endif
   1.761 -
   1.762 -#if defined (__386BSD__)
   1.763 -  printf ("i386-pc-bsd\n"); exit (0);
   1.764 -#endif
   1.765 -
   1.766 -#if defined (sequent)
   1.767 -#if defined (i386)
   1.768 -  printf ("i386-sequent-dynix\n"); exit (0);
   1.769 -#endif
   1.770 -#if defined (ns32000)
   1.771 -  printf ("ns32k-sequent-dynix\n"); exit (0);
   1.772 -#endif
   1.773 -#endif
   1.774 -
   1.775 -#if defined (_SEQUENT_)
   1.776 -    struct utsname un;
   1.777 -
   1.778 -    uname(&un);
   1.779 -
   1.780 -    if (strncmp(un.version, "V2", 2) == 0) {
   1.781 -	printf ("i386-sequent-ptx2\n"); exit (0);
   1.782 -    }
   1.783 -    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
   1.784 -	printf ("i386-sequent-ptx1\n"); exit (0);
   1.785 -    }
   1.786 -    printf ("i386-sequent-ptx\n"); exit (0);
   1.787 -
   1.788 -#endif
   1.789 -
   1.790 -#if defined (vax)
   1.791 -# if !defined (ultrix)
   1.792 -#  include <sys/param.h>
   1.793 -#  if defined (BSD)
   1.794 -#   if BSD == 43
   1.795 -      printf ("vax-dec-bsd4.3\n"); exit (0);
   1.796 -#   else
   1.797 -#    if BSD == 199006
   1.798 -      printf ("vax-dec-bsd4.3reno\n"); exit (0);
   1.799 -#    else
   1.800 -      printf ("vax-dec-bsd\n"); exit (0);
   1.801 -#    endif
   1.802 -#   endif
   1.803 -#  else
   1.804 -    printf ("vax-dec-bsd\n"); exit (0);
   1.805 -#  endif
   1.806 -# else
   1.807 -    printf ("vax-dec-ultrix\n"); exit (0);
   1.808 -# endif
   1.809 -#endif
   1.810 -
   1.811 -#if defined (alliant) && defined (i860)
   1.812 -  printf ("i860-alliant-bsd\n"); exit (0);
   1.813 -#endif
   1.814 -
   1.815 -  exit (1);
   1.816 -}
   1.817 -EOF
   1.818 -
   1.819 -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
   1.820 -	{ echo "$SYSTEM_NAME"; exit; }
   1.821 -
   1.822 -# Apollos put the system type in the environment.
   1.823 -
   1.824 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
   1.825 -
   1.826 -# Convex versions that predate uname can use getsysinfo(1)
   1.827 -
   1.828 -if [ -x /usr/convex/getsysinfo ]
   1.829 -then
   1.830 -    case `getsysinfo -f cpu_type` in
   1.831 -    c1*)
   1.832 -	echo c1-convex-bsd
   1.833 -	exit ;;
   1.834 -    c2*)
   1.835 -	if getsysinfo -f scalar_acc
   1.836 -	then echo c32-convex-bsd
   1.837 -	else echo c2-convex-bsd
   1.838 -	fi
   1.839 -	exit ;;
   1.840 -    c34*)
   1.841 -	echo c34-convex-bsd
   1.842 -	exit ;;
   1.843 -    c38*)
   1.844 -	echo c38-convex-bsd
   1.845 -	exit ;;
   1.846 -    c4*)
   1.847 -	echo c4-convex-bsd
   1.848 -	exit ;;
   1.849 -    esac
   1.850 -fi
   1.851 -
   1.852  cat >&2 <<EOF
   1.853  $0: unable to guess system type
   1.854  
   1.855 -This script, last modified $timestamp, has failed to recognize
   1.856 -the operating system you are using. It is advised that you
   1.857 -download the most up to date version of the config scripts from
   1.858 +This script (version $timestamp), has failed to recognize the
   1.859 +operating system you are using. If your script is old, overwrite *all*
   1.860 +copies of config.guess and config.sub with the latest versions from:
   1.861  
   1.862 -  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
   1.863 +  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
   1.864  and
   1.865 -  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
   1.866 +  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
   1.867  
   1.868 -If the version you run ($0) is already up to date, please
   1.869 -send the following data and any information you think might be
   1.870 -pertinent to <config-patches@gnu.org> in order to provide the needed
   1.871 -information to handle your system.
   1.872 +If $0 has already been updated, send the following data and any
   1.873 +information you think might be pertinent to config-patches@gnu.org to
   1.874 +provide the necessary information to handle your system.
   1.875  
   1.876  config.guess timestamp = $timestamp
   1.877