Updated config.guess and config.sub
authorSam Lantinga <slouken@lokigames.com>
Thu, 10 May 2001 22:58:10 +0000
changeset 286e53ad1f461e
parent 27 a7e598a8d8be
child 29 a8360daed17d
Updated config.guess and config.sub
config.guess
config.sub
     1.1 --- a/config.guess	Thu May 10 21:22:47 2001 +0000
     1.2 +++ b/config.guess	Thu May 10 22:58:10 2001 +0000
     1.3 @@ -1,10 +1,8 @@
     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, 2000, 2001
     1.7 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
     1.8  #   Free Software Foundation, Inc.
     1.9 -
    1.10 -timestamp='2001-03-16'
    1.11 -
    1.12 +#
    1.13  # This file is free software; you can redistribute it and/or modify it
    1.14  # under the terms of the GNU General Public License as published by
    1.15  # the Free Software Foundation; either version 2 of the License, or
    1.16 @@ -25,93 +23,34 @@
    1.17  # the same distribution terms that you use for the rest of that program.
    1.18  
    1.19  # Written by Per Bothner <bothner@cygnus.com>.
    1.20 -# Please send patches to <config-patches@gnu.org>.
    1.21 +# The master version of this file is at the FSF in /home/gd/gnu/lib.
    1.22 +# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
    1.23  #
    1.24  # This script attempts to guess a canonical system name similar to
    1.25  # config.sub.  If it succeeds, it prints the system name on stdout, and
    1.26  # exits with 0.  Otherwise, it exits with 1.
    1.27  #
    1.28  # The plan is that this can be called by configure scripts if you
    1.29 -# don't specify an explicit build system type.
    1.30 +# don't specify an explicit system type (host/target name).
    1.31 +#
    1.32 +# Only a few systems have been added to this list; please add others
    1.33 +# (but try to keep the structure clean).
    1.34 +#
    1.35  
    1.36 -me=`echo "$0" | sed -e 's,.*/,,'`
    1.37 -
    1.38 -usage="\
    1.39 -Usage: $0 [OPTION]
    1.40 -
    1.41 -Output the configuration name of the system \`$me' is run on.
    1.42 -
    1.43 -Operation modes:
    1.44 -  -h, --help         print this help, then exit
    1.45 -  -t, --time-stamp   print date of last modification, then exit
    1.46 -  -v, --version      print version number, then exit
    1.47 -
    1.48 -Report bugs and patches to <config-patches@gnu.org>."
    1.49 -
    1.50 -version="\
    1.51 -GNU config.guess ($timestamp)
    1.52 -
    1.53 -Originally written by Per Bothner.
    1.54 -Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
    1.55 -Free Software Foundation, Inc.
    1.56 -
    1.57 -This is free software; see the source for copying conditions.  There is NO
    1.58 -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    1.59 -
    1.60 -help="
    1.61 -Try \`$me --help' for more information."
    1.62 -
    1.63 -# Parse command line
    1.64 -while test $# -gt 0 ; do
    1.65 -  case $1 in
    1.66 -    --time-stamp | --time* | -t )
    1.67 -       echo "$timestamp" ; exit 0 ;;
    1.68 -    --version | -v )
    1.69 -       echo "$version" ; exit 0 ;;
    1.70 -    --help | --h* | -h )
    1.71 -       echo "$usage"; exit 0 ;;
    1.72 -    -- )     # Stop option processing
    1.73 -       shift; break ;;
    1.74 -    - )	# Use stdin as input.
    1.75 -       break ;;
    1.76 -    -* )
    1.77 -       echo "$me: invalid option $1$help" >&2
    1.78 -       exit 1 ;;
    1.79 -    * )
    1.80 -       break ;;
    1.81 -  esac
    1.82 -done
    1.83 -
    1.84 -if test $# != 0; then
    1.85 -  echo "$me: too many arguments$help" >&2
    1.86 -  exit 1
    1.87 +# Use $HOST_CC if defined. $CC may point to a cross-compiler
    1.88 +if test x"$CC_FOR_BUILD" = x; then
    1.89 +  if test x"$HOST_CC" != x; then
    1.90 +    CC_FOR_BUILD="$HOST_CC"
    1.91 +  else
    1.92 +    if test x"$CC" != x; then
    1.93 +      CC_FOR_BUILD="$CC"
    1.94 +    else
    1.95 +      CC_FOR_BUILD=cc
    1.96 +    fi
    1.97 +  fi
    1.98  fi
    1.99  
   1.100  
   1.101 -dummy=dummy-$$
   1.102 -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
   1.103 -
   1.104 -# CC_FOR_BUILD -- compiler used by this script.
   1.105 -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
   1.106 -# use `HOST_CC' if defined, but it is deprecated.
   1.107 -
   1.108 -case $CC_FOR_BUILD,$HOST_CC,$CC in
   1.109 - ,,)    echo "int dummy(){}" > $dummy.c
   1.110 -	for c in cc gcc c89 ; do
   1.111 -	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
   1.112 -	  if test $? = 0 ; then
   1.113 -	     CC_FOR_BUILD="$c"; break
   1.114 -	  fi
   1.115 -	done
   1.116 -	rm -f $dummy.c $dummy.o $dummy.rel
   1.117 -	if test x"$CC_FOR_BUILD" = x ; then
   1.118 -	  CC_FOR_BUILD=no_compiler_found
   1.119 -	fi
   1.120 -	;;
   1.121 - ,,*)   CC_FOR_BUILD=$CC ;;
   1.122 - ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
   1.123 -esac
   1.124 -
   1.125  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
   1.126  # (ghazi@noc.rutgers.edu 8/24/94.)
   1.127  if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
   1.128 @@ -120,57 +59,15 @@
   1.129  
   1.130  UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
   1.131  UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
   1.132 -UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
   1.133 +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
   1.134  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
   1.135  
   1.136 +dummy=dummy-$$
   1.137 +trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
   1.138 +
   1.139  # Note: order is significant - the case branches are not exclusive.
   1.140  
   1.141  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
   1.142 -    *:NetBSD:*:*)
   1.143 -	# Netbsd (nbsd) targets should (where applicable) match one or
   1.144 -	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
   1.145 -	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
   1.146 -	# switched to ELF, *-*-netbsd* would select the old
   1.147 -	# object file format.  This provides both forward
   1.148 -	# compatibility and a consistent mechanism for selecting the
   1.149 -	# object file format.
   1.150 -	# Determine the machine/vendor (is the vendor relevant).
   1.151 -	case "${UNAME_MACHINE}" in
   1.152 -	    amiga) machine=m68k-unknown ;;
   1.153 -	    arm32) machine=arm-unknown ;;
   1.154 -	    atari*) machine=m68k-atari ;;
   1.155 -	    sun3*) machine=m68k-sun ;;
   1.156 -	    mac68k) machine=m68k-apple ;;
   1.157 -	    macppc) machine=powerpc-apple ;;
   1.158 -	    hp3[0-9][05]) machine=m68k-hp ;;
   1.159 -	    ibmrt|romp-ibm) machine=romp-ibm ;;
   1.160 -	    *) machine=${UNAME_MACHINE}-unknown ;;
   1.161 -	esac
   1.162 -	# The Operating System including object format, if it has switched
   1.163 -	# to ELF recently, or will in the future.
   1.164 -	case "${UNAME_MACHINE}" in
   1.165 -	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
   1.166 -		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
   1.167 -			| grep __ELF__ >/dev/null
   1.168 -		then
   1.169 -		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
   1.170 -		    # Return netbsd for either.  FIX?
   1.171 -		    os=netbsd
   1.172 -		else
   1.173 -		    os=netbsdelf
   1.174 -		fi
   1.175 -		;;
   1.176 -	    *)
   1.177 -	        os=netbsd
   1.178 -		;;
   1.179 -	esac
   1.180 -	# The OS release
   1.181 -	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   1.182 -	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
   1.183 -	# contains redundant information, the shorter form:
   1.184 -	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
   1.185 -	echo "${machine}-${os}${release}"
   1.186 -	exit 0 ;;
   1.187      alpha:OSF1:*:*)
   1.188  	if test $UNAME_RELEASE = "V4.0"; then
   1.189  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
   1.190 @@ -180,51 +77,41 @@
   1.191  	# A Xn.n version is an unreleased experimental baselevel.
   1.192  	# 1.2 uses "1.2" for uname -r.
   1.193  	cat <<EOF >$dummy.s
   1.194 -	.data
   1.195 -\$Lformat:
   1.196 -	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
   1.197 -
   1.198 -	.text
   1.199  	.globl main
   1.200 -	.align 4
   1.201  	.ent main
   1.202  main:
   1.203 -	.frame \$30,16,\$26,0
   1.204 -	ldgp \$29,0(\$27)
   1.205 -	.prologue 1
   1.206 -	.long 0x47e03d80 # implver \$0
   1.207 -	lda \$2,-1
   1.208 -	.long 0x47e20c21 # amask \$2,\$1
   1.209 -	lda \$16,\$Lformat
   1.210 -	mov \$0,\$17
   1.211 -	not \$1,\$18
   1.212 -	jsr \$26,printf
   1.213 -	ldgp \$29,0(\$26)
   1.214 -	mov 0,\$16
   1.215 -	jsr \$26,exit
   1.216 +	.frame \$30,0,\$26,0
   1.217 +	.prologue 0
   1.218 +	.long 0x47e03d80 # implver $0
   1.219 +	lda \$2,259
   1.220 +	.long 0x47e20c21 # amask $2,$1
   1.221 +	srl \$1,8,\$2
   1.222 +	sll \$2,2,\$2
   1.223 +	sll \$0,3,\$0
   1.224 +	addl \$1,\$0,\$0
   1.225 +	addl \$2,\$0,\$0
   1.226 +	ret \$31,(\$26),1
   1.227  	.end main
   1.228  EOF
   1.229  	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
   1.230  	if test "$?" = 0 ; then
   1.231 -		case `./$dummy` in
   1.232 -			0-0)
   1.233 +		./$dummy
   1.234 +		case "$?" in
   1.235 +			7)
   1.236  				UNAME_MACHINE="alpha"
   1.237  				;;
   1.238 -			1-0)
   1.239 +			15)
   1.240  				UNAME_MACHINE="alphaev5"
   1.241  				;;
   1.242 -			1-1)
   1.243 +			14)
   1.244  				UNAME_MACHINE="alphaev56"
   1.245  				;;
   1.246 -			1-101)
   1.247 +			10)
   1.248  				UNAME_MACHINE="alphapca56"
   1.249  				;;
   1.250 -			2-303)
   1.251 +			16)
   1.252  				UNAME_MACHINE="alphaev6"
   1.253  				;;
   1.254 -			2-307)
   1.255 -				UNAME_MACHINE="alphaev67"
   1.256 -				;;
   1.257  		esac
   1.258  	fi
   1.259  	rm -f $dummy.s $dummy
   1.260 @@ -240,8 +127,11 @@
   1.261  	echo alpha-dec-winnt3.5
   1.262  	exit 0 ;;
   1.263      Amiga*:UNIX_System_V:4.0:*)
   1.264 -	echo m68k-unknown-sysv4
   1.265 +	echo m68k-cbm-sysv4
   1.266  	exit 0;;
   1.267 +    amiga:NetBSD:*:*)
   1.268 +      echo m68k-cbm-netbsd${UNAME_RELEASE}
   1.269 +      exit 0 ;;
   1.270      amiga:OpenBSD:*:*)
   1.271  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   1.272  	exit 0 ;;
   1.273 @@ -266,13 +156,13 @@
   1.274      wgrisc:OpenBSD:*:*)
   1.275  	echo mipsel-unknown-openbsd${UNAME_RELEASE}
   1.276  	exit 0 ;;
   1.277 -    *:OS/390:*:*)
   1.278 -	echo i370-ibm-openedition
   1.279 -	exit 0 ;;
   1.280      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   1.281  	echo arm-acorn-riscix${UNAME_RELEASE}
   1.282  	exit 0;;
   1.283 -    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
   1.284 +    arm32:NetBSD:*:*)
   1.285 +	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   1.286 +	exit 0 ;;
   1.287 +    SR2?01:HI-UX/MPP:*:*)
   1.288  	echo hppa1.1-hitachi-hiuxmpp
   1.289  	exit 0;;
   1.290      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
   1.291 @@ -328,12 +218,15 @@
   1.292      aushp:SunOS:*:*)
   1.293  	echo sparc-auspex-sunos${UNAME_RELEASE}
   1.294  	exit 0 ;;
   1.295 +    atari*:NetBSD:*:*)
   1.296 +	echo m68k-atari-netbsd${UNAME_RELEASE}
   1.297 +	exit 0 ;;
   1.298      atari*:OpenBSD:*:*)
   1.299  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   1.300  	exit 0 ;;
   1.301      # The situation for MiNT is a little confusing.  The machine name
   1.302      # can be virtually everything (everything which is not
   1.303 -    # "atarist" or "atariste" at least should have a processor
   1.304 +    # "atarist" or "atariste" at least should have a processor 
   1.305      # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
   1.306      # to the lowercase version "mint" (or "freemint").  Finally
   1.307      # the system name "TOS" denotes a system which is actually not
   1.308 @@ -357,9 +250,15 @@
   1.309      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
   1.310          echo m68k-unknown-mint${UNAME_RELEASE}
   1.311          exit 0 ;;
   1.312 +    sun3*:NetBSD:*:*)
   1.313 +	echo m68k-sun-netbsd${UNAME_RELEASE}
   1.314 +	exit 0 ;;
   1.315      sun3*:OpenBSD:*:*)
   1.316  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   1.317  	exit 0 ;;
   1.318 +    mac68k:NetBSD:*:*)
   1.319 +	echo m68k-apple-netbsd${UNAME_RELEASE}
   1.320 +	exit 0 ;;
   1.321      mac68k:OpenBSD:*:*)
   1.322  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   1.323  	exit 0 ;;
   1.324 @@ -372,6 +271,9 @@
   1.325      powerpc:machten:*:*)
   1.326  	echo powerpc-apple-machten${UNAME_RELEASE}
   1.327  	exit 0 ;;
   1.328 +    macppc:NetBSD:*:*)
   1.329 +        echo powerpc-apple-netbsd${UNAME_RELEASE}
   1.330 +        exit 0 ;;
   1.331      RISC*:Mach:*:*)
   1.332  	echo mips-dec-mach_bsd4.3
   1.333  	exit 0 ;;
   1.334 @@ -387,7 +289,6 @@
   1.335      mips:*:*:UMIPS | mips:*:*:RISCos)
   1.336  	sed 's/^	//' << EOF >$dummy.c
   1.337  #ifdef __cplusplus
   1.338 -#include <stdio.h>  /* for printf() prototype */
   1.339  	int main (int argc, char *argv[]) {
   1.340  #else
   1.341  	int main (argc, argv) int argc; char *argv[]; {
   1.342 @@ -408,7 +309,7 @@
   1.343  EOF
   1.344  	$CC_FOR_BUILD $dummy.c -o $dummy \
   1.345  	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
   1.346 -	  && rm -f $dummy.c $dummy && exit 0
   1.347 +	  && rm $dummy.c $dummy && exit 0
   1.348  	rm -f $dummy.c $dummy
   1.349  	echo mips-mips-riscos${UNAME_RELEASE}
   1.350  	exit 0 ;;
   1.351 @@ -427,18 +328,15 @@
   1.352      AViiON:dgux:*:*)
   1.353          # DG/UX returns AViiON for all architectures
   1.354          UNAME_PROCESSOR=`/usr/bin/uname -p`
   1.355 -	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
   1.356 -	then
   1.357 -	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
   1.358 -	       [ ${TARGET_BINARY_INTERFACE}x = x ]
   1.359 -	    then
   1.360 +        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
   1.361 +	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
   1.362 +	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
   1.363  		echo m88k-dg-dgux${UNAME_RELEASE}
   1.364 -	    else
   1.365 +	else
   1.366  		echo m88k-dg-dguxbcs${UNAME_RELEASE}
   1.367 -	    fi
   1.368 -	else
   1.369 -	    echo i586-dg-dgux${UNAME_RELEASE}
   1.370  	fi
   1.371 +        else echo i586-dg-dgux${UNAME_RELEASE}
   1.372 +        fi
   1.373   	exit 0 ;;
   1.374      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
   1.375  	echo m88k-dolphin-sysv3
   1.376 @@ -462,14 +360,6 @@
   1.377      i?86:AIX:*:*)
   1.378  	echo i386-ibm-aix
   1.379  	exit 0 ;;
   1.380 -    ia64:AIX:*:*)
   1.381 -	if [ -x /usr/bin/oslevel ] ; then
   1.382 -		IBM_REV=`/usr/bin/oslevel`
   1.383 -	else
   1.384 -		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
   1.385 -	fi
   1.386 -	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
   1.387 -	exit 0 ;;
   1.388      *:AIX:2:3)
   1.389  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
   1.390  		sed 's/^		//' << EOF >$dummy.c
   1.391 @@ -483,7 +373,7 @@
   1.392  			exit(0);
   1.393  			}
   1.394  EOF
   1.395 -		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
   1.396 +		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
   1.397  		rm -f $dummy.c $dummy
   1.398  		echo rs6000-ibm-aix3.2.5
   1.399  	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
   1.400 @@ -492,9 +382,9 @@
   1.401  		echo rs6000-ibm-aix3.2
   1.402  	fi
   1.403  	exit 0 ;;
   1.404 -    *:AIX:*:[45])
   1.405 +    *:AIX:*:4)
   1.406  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
   1.407 -	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
   1.408 +	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
   1.409  		IBM_ARCH=rs6000
   1.410  	else
   1.411  		IBM_ARCH=powerpc
   1.412 @@ -502,7 +392,7 @@
   1.413  	if [ -x /usr/bin/oslevel ] ; then
   1.414  		IBM_REV=`/usr/bin/oslevel`
   1.415  	else
   1.416 -		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
   1.417 +		IBM_REV=4.${UNAME_RELEASE}
   1.418  	fi
   1.419  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
   1.420  	exit 0 ;;
   1.421 @@ -512,7 +402,7 @@
   1.422      ibmrt:4.4BSD:*|romp-ibm:BSD:*)
   1.423  	echo romp-ibm-bsd4.4
   1.424  	exit 0 ;;
   1.425 -    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
   1.426 +    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
   1.427  	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
   1.428  	exit 0 ;;                           # report: romp-ibm BSD 4.3
   1.429      *:BOSX:*:*)
   1.430 @@ -528,31 +418,11 @@
   1.431  	echo m68k-hp-bsd4.4
   1.432  	exit 0 ;;
   1.433      9000/[34678]??:HP-UX:*:*)
   1.434 -	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   1.435  	case "${UNAME_MACHINE}" in
   1.436  	    9000/31? )            HP_ARCH=m68000 ;;
   1.437  	    9000/[34]?? )         HP_ARCH=m68k ;;
   1.438  	    9000/[678][0-9][0-9])
   1.439 -              case "${HPUX_REV}" in
   1.440 -                11.[0-9][0-9])
   1.441 -                  if [ -x /usr/bin/getconf ]; then
   1.442 -                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
   1.443 -                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
   1.444 -                    case "${sc_cpu_version}" in
   1.445 -                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
   1.446 -                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
   1.447 -                      532)                      # CPU_PA_RISC2_0
   1.448 -                        case "${sc_kernel_bits}" in
   1.449 -                          32) HP_ARCH="hppa2.0n" ;;
   1.450 -                          64) HP_ARCH="hppa2.0w" ;;
   1.451 -                        esac ;;
   1.452 -                    esac
   1.453 -                  fi ;;
   1.454 -              esac
   1.455 -              if [ "${HP_ARCH}" = "" ]; then
   1.456                sed 's/^              //' << EOF >$dummy.c
   1.457 -
   1.458 -              #define _HPUX_SOURCE
   1.459                #include <stdlib.h>
   1.460                #include <unistd.h>
   1.461  
   1.462 @@ -583,17 +453,12 @@
   1.463                    exit (0);
   1.464                }
   1.465  EOF
   1.466 -	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
   1.467 -	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
   1.468 +	($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
   1.469  	rm -f $dummy.c $dummy
   1.470 -	fi ;;
   1.471  	esac
   1.472 +	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   1.473  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
   1.474  	exit 0 ;;
   1.475 -    ia64:HP-UX:*:*)
   1.476 -	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   1.477 -	echo ia64-hp-hpux${HPUX_REV}
   1.478 -	exit 0 ;;
   1.479      3050*:HI-UX:*:*)
   1.480  	sed 's/^	//' << EOF >$dummy.c
   1.481  	#include <unistd.h>
   1.482 @@ -620,7 +485,7 @@
   1.483  	  exit (0);
   1.484  	}
   1.485  EOF
   1.486 -	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
   1.487 +	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
   1.488  	rm -f $dummy.c $dummy
   1.489  	echo unknown-hitachi-hiuxwe2
   1.490  	exit 0 ;;
   1.491 @@ -682,30 +547,29 @@
   1.492  	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
   1.493  	exit 0 ;;
   1.494      CRAY*TS:*:*:*)
   1.495 -	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.496 -	exit 0 ;;
   1.497 -    CRAY*T3D:*:*:*)
   1.498 -	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.499 +	echo t90-cray-unicos${UNAME_RELEASE}
   1.500  	exit 0 ;;
   1.501      CRAY*T3E:*:*:*)
   1.502 -	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.503 -	exit 0 ;;
   1.504 -    CRAY*SV1:*:*:*)
   1.505 -	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   1.506 +	echo t3e-cray-unicosmk${UNAME_RELEASE}
   1.507  	exit 0 ;;
   1.508      CRAY-2:*:*:*)
   1.509  	echo cray2-cray-unicos
   1.510          exit 0 ;;
   1.511 -    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
   1.512 -	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   1.513 +    F300:UNIX_System_V:*:*)
   1.514          FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   1.515          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
   1.516 -        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.517 +        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   1.518          exit 0 ;;
   1.519 +    F301:UNIX_System_V:*:*)
   1.520 +       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
   1.521 +       exit 0 ;;
   1.522 +    hp3[0-9][05]:NetBSD:*:*)
   1.523 +	echo m68k-hp-netbsd${UNAME_RELEASE}
   1.524 +	exit 0 ;;
   1.525      hp300:OpenBSD:*:*)
   1.526  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   1.527  	exit 0 ;;
   1.528 -    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   1.529 +    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
   1.530  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   1.531  	exit 0 ;;
   1.532      sparc*:BSD/OS:*:*)
   1.533 @@ -715,8 +579,17 @@
   1.534  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   1.535  	exit 0 ;;
   1.536      *:FreeBSD:*:*)
   1.537 +	if test -x /usr/bin/objformat; then
   1.538 +	    if test "elf" = "`/usr/bin/objformat`"; then
   1.539 +		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
   1.540 +		exit 0
   1.541 +	    fi
   1.542 +	fi
   1.543  	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   1.544  	exit 0 ;;
   1.545 +    *:NetBSD:*:*)
   1.546 +	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   1.547 +	exit 0 ;;
   1.548      *:OpenBSD:*:*)
   1.549  	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   1.550  	exit 0 ;;
   1.551 @@ -726,9 +599,6 @@
   1.552      i*:MINGW*:*)
   1.553  	echo ${UNAME_MACHINE}-pc-mingw32
   1.554  	exit 0 ;;
   1.555 -    i*:PW*:*)
   1.556 -	echo ${UNAME_MACHINE}-pc-pw32
   1.557 -	exit 0 ;;
   1.558      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
   1.559  	# How do we know it's Interix rather than the generic POSIX subsystem?
   1.560  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
   1.561 @@ -747,41 +617,34 @@
   1.562      *:GNU:*:*)
   1.563  	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
   1.564  	exit 0 ;;
   1.565 -    i*86:Minix:*:*)
   1.566 -	echo ${UNAME_MACHINE}-pc-minix
   1.567 -	exit 0 ;;
   1.568 -    arm*:Linux:*:*)
   1.569 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.570 -	exit 0 ;;
   1.571 -    ia64:Linux:*:*)
   1.572 -	echo ${UNAME_MACHINE}-unknown-linux
   1.573 -	exit 0 ;;
   1.574 -    m68*:Linux:*:*)
   1.575 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.576 -	exit 0 ;;
   1.577 -    mips:Linux:*:*)
   1.578 -	cat >$dummy.c <<EOF
   1.579 -#ifdef __cplusplus
   1.580 -#include <stdio.h>  /* for printf() prototype */
   1.581 -int main (int argc, char *argv[]) {
   1.582 -#else
   1.583 -int main (argc, argv) int argc; char *argv[]; {
   1.584 -#endif
   1.585 -#ifdef __MIPSEB__
   1.586 -  printf ("%s-unknown-linux-gnu\n", argv[1]);
   1.587 -#endif
   1.588 -#ifdef __MIPSEL__
   1.589 -  printf ("%sel-unknown-linux-gnu\n", argv[1]);
   1.590 -#endif
   1.591 -  return 0;
   1.592 -}
   1.593 -EOF
   1.594 -	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
   1.595 -	rm -f $dummy.c $dummy
   1.596 -	;;
   1.597 -    ppc:Linux:*:*)
   1.598 -	# Determine Lib Version
   1.599 -	cat >$dummy.c <<EOF
   1.600 +    *:Linux:*:*)
   1.601 +#	# uname on the ARM produces all sorts of strangeness, and we need to
   1.602 +#	# filter it out.
   1.603 +#	case "$UNAME_MACHINE" in
   1.604 +#	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
   1.605 +#	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
   1.606 +#	esac
   1.607 +
   1.608 +	# The BFD linker knows what the default object file format is, so
   1.609 +	# first see if it will tell us. cd to the root directory to prevent
   1.610 +	# problems with other programs or directories called `ld' in the path.
   1.611 +	ld_help_string=`cd /; ld --help 2>&1`
   1.612 +	ld_supported_emulations=`echo $ld_help_string \
   1.613 +			 | sed -ne '/supported emulations:/!d
   1.614 +				    s/[ 	][ 	]*/ /g
   1.615 +				    s/.*supported emulations: *//
   1.616 +				    s/ .*//
   1.617 +				    p'`
   1.618 +        case "$ld_supported_emulations" in
   1.619 +	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
   1.620 +	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
   1.621 +	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
   1.622 +	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
   1.623 +	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
   1.624 +	  elf32arm)   echo "${UNAME_MACHINE}-unknown-linux-gnu"     ; exit 0 ;;
   1.625 +	  elf32ppc)
   1.626 +		# Determine Lib Version
   1.627 +		cat >$dummy.c <<EOF
   1.628  #include <features.h>
   1.629  #if defined(__GLIBC__)
   1.630  extern char __libc_version[];
   1.631 @@ -794,130 +657,110 @@
   1.632  #if defined(__GLIBC__)
   1.633    printf("%s %s\n", __libc_version, __libc_release);
   1.634  #else
   1.635 -  printf("unknown\n");
   1.636 +  printf("unkown\n");
   1.637  #endif
   1.638    return 0;
   1.639  }
   1.640  EOF
   1.641 -	LIBC=""
   1.642 -	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
   1.643 -	if test "$?" = 0 ; then
   1.644 -		./$dummy | grep 1\.99 > /dev/null
   1.645 -		if test "$?" = 0 ; then LIBC="libc1" ; fi
   1.646 -	fi
   1.647 -	rm -f $dummy.c $dummy
   1.648 -	echo powerpc-unknown-linux-gnu${LIBC}
   1.649 -	exit 0 ;;
   1.650 -    alpha:Linux:*:*)
   1.651 -	cat <<EOF >$dummy.s
   1.652 -	  .data
   1.653 -	  \$Lformat:
   1.654 -		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
   1.655 -	   .text
   1.656 +		LIBC=""
   1.657 +		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
   1.658 +		if test "$?" = 0 ; then
   1.659 +			./$dummy | grep 1\.99 > /dev/null
   1.660 +			if test "$?" = 0 ; then
   1.661 +				LIBC="libc1"
   1.662 +			fi
   1.663 +		fi	
   1.664 +		rm -f $dummy.c $dummy
   1.665 +		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
   1.666 +	esac
   1.667 +
   1.668 +	if test "${UNAME_MACHINE}" = "alpha" ; then
   1.669 +		sed 's/^	//'  <<EOF >$dummy.s
   1.670  		.globl main
   1.671 -		.align 4
   1.672  		.ent main
   1.673 -	    main:
   1.674 -		.frame \$30,16,\$26,0
   1.675 -		ldgp \$29,0(\$27)
   1.676 -		.prologue 1
   1.677 -		.long 0x47e03d80 # implver \$0
   1.678 -		lda \$2,-1
   1.679 -		.long 0x47e20c21 # amask \$2,\$1
   1.680 -		lda \$16,\$Lformat
   1.681 -		mov \$0,\$17
   1.682 -		not \$1,\$18
   1.683 -		jsr \$26,printf
   1.684 -		ldgp \$29,0(\$26)
   1.685 -		mov 0,\$16
   1.686 -		jsr \$26,exit
   1.687 +	main:
   1.688 +		.frame \$30,0,\$26,0
   1.689 +		.prologue 0
   1.690 +		.long 0x47e03d80 # implver $0
   1.691 +		lda \$2,259
   1.692 +		.long 0x47e20c21 # amask $2,$1
   1.693 +		srl \$1,8,\$2
   1.694 +		sll \$2,2,\$2
   1.695 +		sll \$0,3,\$0
   1.696 +		addl \$1,\$0,\$0
   1.697 +		addl \$2,\$0,\$0
   1.698 +		ret \$31,(\$26),1
   1.699  		.end main
   1.700  EOF
   1.701 -	LIBC=""
   1.702 -	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
   1.703 -	if test "$?" = 0 ; then
   1.704 -		case `./$dummy` in
   1.705 -		0-0)	UNAME_MACHINE="alpha" ;;
   1.706 -		1-0)	UNAME_MACHINE="alphaev5" ;;
   1.707 -		1-1)    UNAME_MACHINE="alphaev56" ;;
   1.708 -		1-101)	UNAME_MACHINE="alphapca56" ;;
   1.709 -		2-303)	UNAME_MACHINE="alphaev6" ;;
   1.710 -		2-307)	UNAME_MACHINE="alphaev67" ;;
   1.711 -		esac
   1.712 -		objdump --private-headers $dummy | \
   1.713 -		  grep ld.so.1 > /dev/null
   1.714 +		LIBC=""
   1.715 +		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
   1.716  		if test "$?" = 0 ; then
   1.717 -			LIBC="libc1"
   1.718 +			./$dummy
   1.719 +			case "$?" in
   1.720 +			7)
   1.721 +				UNAME_MACHINE="alpha"
   1.722 +				;;
   1.723 +			15)
   1.724 +				UNAME_MACHINE="alphaev5"
   1.725 +				;;
   1.726 +			14)
   1.727 +				UNAME_MACHINE="alphaev56"
   1.728 +				;;
   1.729 +			10)
   1.730 +				UNAME_MACHINE="alphapca56"
   1.731 +				;;
   1.732 +			16)
   1.733 +				UNAME_MACHINE="alphaev6"
   1.734 +				;;
   1.735 +			esac
   1.736 +
   1.737 +			objdump --private-headers $dummy | \
   1.738 +			  grep ld.so.1 > /dev/null
   1.739 +			if test "$?" = 0 ; then
   1.740 +				LIBC="libc1"
   1.741 +			fi
   1.742  		fi
   1.743 -	fi
   1.744 -	rm -f $dummy.s $dummy
   1.745 -	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
   1.746 -	exit 0 ;;
   1.747 -    parisc:Linux:*:* | hppa:Linux:*:*)
   1.748 -	# Look for CPU level
   1.749 -	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
   1.750 -	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
   1.751 -	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
   1.752 -	  *)    echo hppa-unknown-linux-gnu ;;
   1.753 -	esac
   1.754 -	exit 0 ;;
   1.755 -    parisc64:Linux:*:* | hppa64:Linux:*:*)
   1.756 -	echo hppa64-unknown-linux-gnu
   1.757 -	exit 0 ;;
   1.758 -    s390:Linux:*:* | s390x:Linux:*:*)
   1.759 -	echo ${UNAME_MACHINE}-ibm-linux
   1.760 -	exit 0 ;;
   1.761 -    sh*:Linux:*:*)
   1.762 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.763 -	exit 0 ;;
   1.764 -    sparc:Linux:*:* | sparc64:Linux:*:*)
   1.765 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   1.766 -	exit 0 ;;
   1.767 -    x86_64:Linux:*:*)
   1.768 -	echo x86_64-unknown-linux-gnu
   1.769 -	exit 0 ;;
   1.770 -    i?86:Linux:*:*)
   1.771 -	# The BFD linker knows what the default object file format is, so
   1.772 -	# first see if it will tell us. cd to the root directory to prevent
   1.773 -	# problems with other programs or directories called `ld' in the path.
   1.774 -	ld_supported_emulations=`cd /; ld --help 2>&1 \
   1.775 -			 | sed -ne '/supported emulations:/!d
   1.776 -				    s/[ 	][ 	]*/ /g
   1.777 -				    s/.*supported emulations: *//
   1.778 -				    s/ .*//
   1.779 -				    p'`
   1.780 -        case "$ld_supported_emulations" in
   1.781 -	  i?86linux)
   1.782 -		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
   1.783 -		exit 0
   1.784 -		;;
   1.785 -	  elf_i?86)
   1.786 -		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
   1.787 -		;;
   1.788 -	  i?86coff)
   1.789 -		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
   1.790 -		exit 0
   1.791 -		;;
   1.792 -	esac
   1.793 -	# Either a pre-BFD a.out linker (linux-gnuoldld)
   1.794 -	# or one that does not give us useful --help.
   1.795 -	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
   1.796 -	# If ld does not provide *any* "supported emulations:"
   1.797 -	# that means it is gnuoldld.
   1.798 -	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
   1.799 -	case "${UNAME_MACHINE}" in
   1.800 -	i?86)
   1.801 -	  VENDOR=pc;
   1.802 -	  ;;
   1.803 -	*)
   1.804 -	  VENDOR=unknown;
   1.805 -	  ;;
   1.806 -	esac
   1.807 -	# Determine whether the default compiler is a.out or elf
   1.808 -	cat >$dummy.c <<EOF
   1.809 +		rm -f $dummy.s $dummy
   1.810 +		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
   1.811 +	elif test "${UNAME_MACHINE}" = "mips" ; then
   1.812 +	  cat >$dummy.c <<EOF
   1.813 +#ifdef __cplusplus
   1.814 +	int main (int argc, char *argv[]) {
   1.815 +#else
   1.816 +	int main (argc, argv) int argc; char *argv[]; {
   1.817 +#endif
   1.818 +#ifdef __MIPSEB__
   1.819 +  printf ("%s-unknown-linux-gnu\n", argv[1]);
   1.820 +#endif
   1.821 +#ifdef __MIPSEL__
   1.822 +  printf ("%sel-unknown-linux-gnu\n", argv[1]);
   1.823 +#endif
   1.824 +  return 0;
   1.825 +}
   1.826 +EOF
   1.827 +	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
   1.828 +	  rm -f $dummy.c $dummy
   1.829 +	else
   1.830 +	  # Either a pre-BFD a.out linker (linux-gnuoldld)
   1.831 +	  # or one that does not give us useful --help.
   1.832 +	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
   1.833 +	  # If ld does not provide *any* "supported emulations:"
   1.834 +	  # that means it is gnuoldld.
   1.835 +	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
   1.836 +	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
   1.837 +
   1.838 +	  case "${UNAME_MACHINE}" in
   1.839 +	  i?86)
   1.840 +	    VENDOR=pc;
   1.841 +	    ;;
   1.842 +	  *)
   1.843 +	    VENDOR=unknown;
   1.844 +	    ;;
   1.845 +	  esac
   1.846 +	  # Determine whether the default compiler is a.out or elf
   1.847 +	  cat >$dummy.c <<EOF
   1.848  #include <features.h>
   1.849  #ifdef __cplusplus
   1.850 -#include <stdio.h>  /* for printf() prototype */
   1.851  	int main (int argc, char *argv[]) {
   1.852  #else
   1.853  	int main (argc, argv) int argc; char *argv[]; {
   1.854 @@ -938,10 +781,9 @@
   1.855    return 0;
   1.856  }
   1.857  EOF
   1.858 -	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
   1.859 -	rm -f $dummy.c $dummy
   1.860 -	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
   1.861 -	;;
   1.862 +	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
   1.863 +	  rm -f $dummy.c $dummy
   1.864 +	fi ;;
   1.865  # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
   1.866  # are messed up and put the nodename in both sysname and nodename.
   1.867      i?86:DYNIX/ptx:4*:*)
   1.868 @@ -956,21 +798,19 @@
   1.869  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
   1.870  	exit 0 ;;
   1.871      i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
   1.872 -	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
   1.873  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
   1.874 -		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
   1.875 +		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
   1.876  	else
   1.877 -		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
   1.878 +		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
   1.879  	fi
   1.880  	exit 0 ;;
   1.881      i?86:*:5:7*)
   1.882 -        # Fixed at (any) Pentium or better
   1.883 -        UNAME_MACHINE=i586
   1.884 -        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
   1.885 -	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
   1.886 -	else
   1.887 -	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
   1.888 -	fi
   1.889 +	UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
   1.890 +	(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
   1.891 +	(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
   1.892 +	(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
   1.893 +	(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
   1.894 +	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
   1.895  	exit 0 ;;
   1.896      i?86:*:3.2:*)
   1.897  	if test -f /usr/options/cb.name; then
   1.898 @@ -990,11 +830,7 @@
   1.899  		echo ${UNAME_MACHINE}-pc-sysv32
   1.900  	fi
   1.901  	exit 0 ;;
   1.902 -    i?86:*DOS:*:*)
   1.903 -	echo ${UNAME_MACHINE}-pc-msdosdjgpp
   1.904 -	exit 0 ;;
   1.905      pc:*:*:*)
   1.906 -	# Left here for compatibility:
   1.907          # uname -m prints for DJGPP always 'pc', but it prints nothing about
   1.908          # the processor, so we play safe by assuming i386.
   1.909  	echo i386-pc-msdosdjgpp
   1.910 @@ -1018,7 +854,7 @@
   1.911  	exit 0 ;;
   1.912      M68*:*:R3V[567]*:*)
   1.913  	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
   1.914 -    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
   1.915 +    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
   1.916  	OS_REL=''
   1.917  	test -r /etc/.relid \
   1.918  	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
   1.919 @@ -1041,12 +877,9 @@
   1.920      TSUNAMI:LynxOS:2.*:*)
   1.921  	echo sparc-unknown-lynxos${UNAME_RELEASE}
   1.922  	exit 0 ;;
   1.923 -    rs6000:LynxOS:2.*:*)
   1.924 +    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
   1.925  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
   1.926  	exit 0 ;;
   1.927 -    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*)
   1.928 -	echo powerpc-unknown-lynxos${UNAME_RELEASE}
   1.929 -	exit 0 ;;
   1.930      SM[BE]S:UNIX_SV:*:*)
   1.931  	echo mips-dde-sysv${UNAME_RELEASE}
   1.932  	exit 0 ;;
   1.933 @@ -1080,7 +913,7 @@
   1.934      mc68*:A/UX:*:*)
   1.935  	echo m68k-apple-aux${UNAME_RELEASE}
   1.936  	exit 0 ;;
   1.937 -    news*:NEWS-OS:6*:*)
   1.938 +    news*:NEWS-OS:*:6*)
   1.939  	echo mips-sony-newsos6
   1.940  	exit 0 ;;
   1.941      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
   1.942 @@ -1111,64 +944,6 @@
   1.943      *:Rhapsody:*:*)
   1.944  	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
   1.945  	exit 0 ;;
   1.946 -    *:Darwin:*:*)
   1.947 -	echo `uname -p`-apple-darwin${UNAME_RELEASE}
   1.948 -	exit 0 ;;
   1.949 -    *:procnto*:*:* | *:QNX:[0123456789]*:*)
   1.950 -	if test "${UNAME_MACHINE}" = "x86pc"; then
   1.951 -		UNAME_MACHINE=pc
   1.952 -	fi
   1.953 -	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
   1.954 -	exit 0 ;;
   1.955 -    *:QNX:*:4*)
   1.956 -	echo i386-pc-qnx
   1.957 -	exit 0 ;;
   1.958 -    NSR-[KW]:NONSTOP_KERNEL:*:*)
   1.959 -	echo nsr-tandem-nsk${UNAME_RELEASE}
   1.960 -	exit 0 ;;
   1.961 -    *:NonStop-UX:*:*)
   1.962 -	echo mips-compaq-nonstopux
   1.963 -	exit 0 ;;
   1.964 -    BS2000:POSIX*:*:*)
   1.965 -	echo bs2000-siemens-sysv
   1.966 -	exit 0 ;;
   1.967 -    DS/*:UNIX_System_V:*:*)
   1.968 -	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
   1.969 -	exit 0 ;;
   1.970 -    *:Plan9:*:*)
   1.971 -	# "uname -m" is not consistent, so use $cputype instead. 386
   1.972 -	# is converted to i386 for consistency with other x86
   1.973 -	# operating systems.
   1.974 -	if test "$cputype" = "386"; then
   1.975 -	    UNAME_MACHINE=i386
   1.976 -	else
   1.977 -	    UNAME_MACHINE="$cputype"
   1.978 -	fi
   1.979 -	echo ${UNAME_MACHINE}-unknown-plan9
   1.980 -	exit 0 ;;
   1.981 -    i?86:OS/2:*:*)
   1.982 -	# If we were able to find `uname', then EMX Unix compatibility
   1.983 -	# is probably installed.
   1.984 -	echo ${UNAME_MACHINE}-pc-os2-emx
   1.985 -	exit 0 ;;
   1.986 -    *:TOPS-10:*:*)
   1.987 -	echo pdp10-unknown-tops10
   1.988 -	exit 0 ;;
   1.989 -    *:TENEX:*:*)
   1.990 -	echo pdp10-unknown-tenex
   1.991 -	exit 0 ;;
   1.992 -    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
   1.993 -	echo pdp10-dec-tops20
   1.994 -	exit 0 ;;
   1.995 -    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
   1.996 -	echo pdp10-xkl-tops20
   1.997 -	exit 0 ;;
   1.998 -    *:TOPS-20:*:*)
   1.999 -	echo pdp10-unknown-tops20
  1.1000 -	exit 0 ;;
  1.1001 -    *:ITS:*:*)
  1.1002 -	echo pdp10-unknown-its
  1.1003 -	exit 0 ;;
  1.1004  esac
  1.1005  
  1.1006  #echo '(No uname command or uname output not recognized.)' 1>&2
  1.1007 @@ -1260,24 +1035,11 @@
  1.1008  #endif
  1.1009  
  1.1010  #if defined (vax)
  1.1011 -# if !defined (ultrix)
  1.1012 -#  include <sys/param.h>
  1.1013 -#  if defined (BSD)
  1.1014 -#   if BSD == 43
  1.1015 -      printf ("vax-dec-bsd4.3\n"); exit (0);
  1.1016 -#   else
  1.1017 -#    if BSD == 199006
  1.1018 -      printf ("vax-dec-bsd4.3reno\n"); exit (0);
  1.1019 -#    else
  1.1020 -      printf ("vax-dec-bsd\n"); exit (0);
  1.1021 -#    endif
  1.1022 -#   endif
  1.1023 -#  else
  1.1024 -    printf ("vax-dec-bsd\n"); exit (0);
  1.1025 -#  endif
  1.1026 -# else
  1.1027 -    printf ("vax-dec-ultrix\n"); exit (0);
  1.1028 -# endif
  1.1029 +#if !defined (ultrix)
  1.1030 +  printf ("vax-dec-bsd\n"); exit (0);
  1.1031 +#else
  1.1032 +  printf ("vax-dec-ultrix\n"); exit (0);
  1.1033 +#endif
  1.1034  #endif
  1.1035  
  1.1036  #if defined (alliant) && defined (i860)
  1.1037 @@ -1288,7 +1050,7 @@
  1.1038  }
  1.1039  EOF
  1.1040  
  1.1041 -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
  1.1042 +$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
  1.1043  rm -f $dummy.c $dummy
  1.1044  
  1.1045  # Apollos put the system type in the environment.
  1.1046 @@ -1321,48 +1083,6 @@
  1.1047      esac
  1.1048  fi
  1.1049  
  1.1050 -cat >&2 <<EOF
  1.1051 -$0: unable to guess system type
  1.1052 -
  1.1053 -This script, last modified $timestamp, has failed to recognize
  1.1054 -the operating system you are using. It is advised that you
  1.1055 -download the most up to date version of the config scripts from
  1.1056 -
  1.1057 -    ftp://ftp.gnu.org/pub/gnu/config/
  1.1058 -
  1.1059 -If the version you run ($0) is already up to date, please
  1.1060 -send the following data and any information you think might be
  1.1061 -pertinent to <config-patches@gnu.org> in order to provide the needed
  1.1062 -information to handle your system.
  1.1063 -
  1.1064 -config.guess timestamp = $timestamp
  1.1065 -
  1.1066 -uname -m = `(uname -m) 2>/dev/null || echo unknown`
  1.1067 -uname -r = `(uname -r) 2>/dev/null || echo unknown`
  1.1068 -uname -s = `(uname -s) 2>/dev/null || echo unknown`
  1.1069 -uname -v = `(uname -v) 2>/dev/null || echo unknown`
  1.1070 -
  1.1071 -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
  1.1072 -/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
  1.1073 -
  1.1074 -hostinfo               = `(hostinfo) 2>/dev/null`
  1.1075 -/bin/universe          = `(/bin/universe) 2>/dev/null`
  1.1076 -/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
  1.1077 -/bin/arch              = `(/bin/arch) 2>/dev/null`
  1.1078 -/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
  1.1079 -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
  1.1080 -
  1.1081 -UNAME_MACHINE = ${UNAME_MACHINE}
  1.1082 -UNAME_RELEASE = ${UNAME_RELEASE}
  1.1083 -UNAME_SYSTEM  = ${UNAME_SYSTEM}
  1.1084 -UNAME_VERSION = ${UNAME_VERSION}
  1.1085 -EOF
  1.1086 +#echo '(Unable to guess system type)' 1>&2
  1.1087  
  1.1088  exit 1
  1.1089 -
  1.1090 -# Local variables:
  1.1091 -# eval: (add-hook 'write-file-hooks 'time-stamp)
  1.1092 -# time-stamp-start: "timestamp='"
  1.1093 -# time-stamp-format: "%:y-%02m-%02d"
  1.1094 -# time-stamp-end: "'"
  1.1095 -# End:
     2.1 --- a/config.sub	Thu May 10 21:22:47 2001 +0000
     2.2 +++ b/config.sub	Thu May 10 22:58:10 2001 +0000
     2.3 @@ -1,10 +1,6 @@
     2.4  #! /bin/sh
     2.5 -# Configuration validation subroutine script.
     2.6 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
     2.7 -#   Free Software Foundation, Inc.
     2.8 -
     2.9 -timestamp='2001-03-19'
    2.10 -
    2.11 +# Configuration validation subroutine script, version 1.1.
    2.12 +#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
    2.13  # This file is (in principle) common to ALL GNU software.
    2.14  # The presence of a machine in this file suggests that SOME GNU software
    2.15  # can handle that machine.  It does not imply ALL GNU software can.
    2.16 @@ -29,8 +25,6 @@
    2.17  # configuration script generated by Autoconf, you may include it under
    2.18  # the same distribution terms that you use for the rest of that program.
    2.19  
    2.20 -# Please send patches to <config-patches@gnu.org>.
    2.21 -#
    2.22  # Configuration subroutine to validate and canonicalize a configuration type.
    2.23  # Supply the specified configuration type as an argument.
    2.24  # If it is invalid, we print an error message on stderr and exit with code 1.
    2.25 @@ -51,73 +45,30 @@
    2.26  #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
    2.27  # It is wrong to echo any other type of specification.
    2.28  
    2.29 -me=`echo "$0" | sed -e 's,.*/,,'`
    2.30 +if [ x$1 = x ]
    2.31 +then
    2.32 +	echo Configuration name missing. 1>&2
    2.33 +	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
    2.34 +	echo "or     $0 ALIAS" 1>&2
    2.35 +	echo where ALIAS is a recognized configuration type. 1>&2
    2.36 +	exit 1
    2.37 +fi
    2.38  
    2.39 -usage="\
    2.40 -Usage: $0 [OPTION] CPU-MFR-OPSYS
    2.41 -       $0 [OPTION] ALIAS
    2.42 -
    2.43 -Canonicalize a configuration name.
    2.44 -
    2.45 -Operation modes:
    2.46 -  -h, --help         print this help, then exit
    2.47 -  -t, --time-stamp   print date of last modification, then exit
    2.48 -  -v, --version      print version number, then exit
    2.49 -
    2.50 -Report bugs and patches to <config-patches@gnu.org>."
    2.51 -
    2.52 -version="\
    2.53 -GNU config.sub ($timestamp)
    2.54 -
    2.55 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
    2.56 -Free Software Foundation, Inc.
    2.57 -
    2.58 -This is free software; see the source for copying conditions.  There is NO
    2.59 -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    2.60 -
    2.61 -help="
    2.62 -Try \`$me --help' for more information."
    2.63 -
    2.64 -# Parse command line
    2.65 -while test $# -gt 0 ; do
    2.66 -  case $1 in
    2.67 -    --time-stamp | --time* | -t )
    2.68 -       echo "$timestamp" ; exit 0 ;;
    2.69 -    --version | -v )
    2.70 -       echo "$version" ; exit 0 ;;
    2.71 -    --help | --h* | -h )
    2.72 -       echo "$usage"; exit 0 ;;
    2.73 -    -- )     # Stop option processing
    2.74 -       shift; break ;;
    2.75 -    - )	# Use stdin as input.
    2.76 -       break ;;
    2.77 -    -* )
    2.78 -       echo "$me: invalid option $1$help"
    2.79 -       exit 1 ;;
    2.80 -
    2.81 -    *local*)
    2.82 -       # First pass through any local machine types.
    2.83 -       echo $1
    2.84 -       exit 0;;
    2.85 -
    2.86 -    * )
    2.87 -       break ;;
    2.88 -  esac
    2.89 -done
    2.90 -
    2.91 -case $# in
    2.92 - 0) echo "$me: missing argument$help" >&2
    2.93 -    exit 1;;
    2.94 - 1) ;;
    2.95 - *) echo "$me: too many arguments$help" >&2
    2.96 -    exit 1;;
    2.97 +# First pass through any local machine types.
    2.98 +case $1 in
    2.99 +	*local*)
   2.100 +		echo $1
   2.101 +		exit 0
   2.102 +		;;
   2.103 +	*)
   2.104 +	;;
   2.105  esac
   2.106  
   2.107  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
   2.108  # Here we must recognize all the valid KERNEL-OS combinations.
   2.109  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   2.110  case $maybe_os in
   2.111 -  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
   2.112 +  linux-gnu*)
   2.113      os=-$maybe_os
   2.114      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
   2.115      ;;
   2.116 @@ -143,7 +94,7 @@
   2.117  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   2.118  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   2.119  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
   2.120 -	-apple | -axis)
   2.121 +	-apple)
   2.122  		os=
   2.123  		basic_machine=$1
   2.124  		;;
   2.125 @@ -154,7 +105,7 @@
   2.126  	-scout)
   2.127  		;;
   2.128  	-wrs)
   2.129 -		os=-vxworks
   2.130 +		os=vxworks
   2.131  		basic_machine=$1
   2.132  		;;
   2.133  	-hiux*)
   2.134 @@ -205,49 +156,33 @@
   2.135  	-psos*)
   2.136  		os=-psos
   2.137  		;;
   2.138 -	-mint | -mint[0-9]*)
   2.139 -		basic_machine=m68k-atari
   2.140 -		os=-mint
   2.141 -		;;
   2.142  esac
   2.143  
   2.144  # Decode aliases for certain CPU-COMPANY combinations.
   2.145  case $basic_machine in
   2.146  	# Recognize the basic CPU types without company name.
   2.147  	# Some are omitted here because they have special meanings below.
   2.148 -	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
   2.149 -	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
   2.150 -		| pyramid | mn10200 | mn10300 | tron | a29k \
   2.151 +	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
   2.152 +		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
   2.153  		| 580 | i960 | h8300 \
   2.154 -		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
   2.155  		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
   2.156 -		| hppa64 \
   2.157 -		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
   2.158 -		| alphaev6[78] \
   2.159 -		| we32k | ns16k | clipper | i370 | sh | sh[34] \
   2.160 -		| powerpc | powerpcle \
   2.161 -		| 1750a | dsp16xx | pdp10 | pdp11 \
   2.162 -		| mips16 | mips64 | mipsel | mips64el \
   2.163 +		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
   2.164 +		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
   2.165 +		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
   2.166  		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
   2.167  		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
   2.168 -		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
   2.169 -		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
   2.170 -		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
   2.171 -		| pj | pjl | h8500)
   2.172 +		| mips64vr5000 | miprs64vr5000el \
   2.173 +		| armv[34][lb] | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
   2.174 +		| thumb | d10v)
   2.175  		basic_machine=$basic_machine-unknown
   2.176  		;;
   2.177 -	m6811 | m68hc11 | m6812 | m68hc12)
   2.178 -		# Motorola 68HC11/12.
   2.179 -		basic_machine=$basic_machine-unknown
   2.180 -		os=-none
   2.181 -		;;
   2.182 -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
   2.183 +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
   2.184  		;;
   2.185  
   2.186  	# We use `pc' rather than `unknown'
   2.187  	# because (1) that's what they normally are, and
   2.188  	# (2) the word "unknown" tends to confuse beginning users.
   2.189 -	i[234567]86 | x86_64)
   2.190 +	i[34567]86)
   2.191  	  basic_machine=$basic_machine-pc
   2.192  	  ;;
   2.193  	# Object if more than one company name word.
   2.194 @@ -256,30 +191,24 @@
   2.195  		exit 1
   2.196  		;;
   2.197  	# Recognize the basic CPU types with company name.
   2.198 -	# FIXME: clean up the formatting here.
   2.199 -	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
   2.200 -	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
   2.201 -	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
   2.202 +	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
   2.203 +	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
   2.204  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
   2.205  	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
   2.206  	      | xmp-* | ymp-* \
   2.207 -	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
   2.208 -	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
   2.209 -	      | hppa2.0n-* | hppa64-* \
   2.210 -	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
   2.211 -	      | alphaev6[78]-* \
   2.212 +	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
   2.213 +	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
   2.214  	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
   2.215  	      | clipper-* | orion-* \
   2.216 -	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
   2.217 +	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
   2.218  	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
   2.219  	      | mips64el-* | mips64orion-* | mips64orionel-* \
   2.220  	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
   2.221 -	      | mipstx39-* | mipstx39el-* | mcore-* \
   2.222 -	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
   2.223 -	      | [cjt]90-* \
   2.224 +	      | mipstx39-* | mipstx39el-* \
   2.225 +	      | armv[34][lb]-* \
   2.226 +	      | f301-* | armv*-* | t3e-* \
   2.227  	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
   2.228 -	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
   2.229 -	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
   2.230 +	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
   2.231  		;;
   2.232  	# Recognize the various machine names and aliases which stand
   2.233  	# for a CPU type and a company and sometimes even an OS.
   2.234 @@ -316,14 +245,14 @@
   2.235  		os=-sysv
   2.236  		;;
   2.237  	amiga | amiga-*)
   2.238 -		basic_machine=m68k-unknown
   2.239 +		basic_machine=m68k-cbm
   2.240  		;;
   2.241  	amigaos | amigados)
   2.242 -		basic_machine=m68k-unknown
   2.243 +		basic_machine=m68k-cbm
   2.244  		os=-amigaos
   2.245  		;;
   2.246  	amigaunix | amix)
   2.247 -		basic_machine=m68k-unknown
   2.248 +		basic_machine=m68k-cbm
   2.249  		os=-sysv4
   2.250  		;;
   2.251  	apollo68)
   2.252 @@ -370,16 +299,13 @@
   2.253  		basic_machine=cray2-cray
   2.254  		os=-unicos
   2.255  		;;
   2.256 -	[cjt]90)
   2.257 -		basic_machine=${basic_machine}-cray
   2.258 +	[ctj]90-cray)
   2.259 +		basic_machine=c90-cray
   2.260  		os=-unicos
   2.261  		;;
   2.262  	crds | unos)
   2.263  		basic_machine=m68k-crds
   2.264  		;;
   2.265 -	cris | cris-* | etrax*)
   2.266 -		basic_machine=cris-axis
   2.267 -		;;
   2.268  	da30 | da30-*)
   2.269  		basic_machine=m68k-da30
   2.270  		;;
   2.271 @@ -427,10 +353,6 @@
   2.272  		basic_machine=tron-gmicro
   2.273  		os=-sysv
   2.274  		;;
   2.275 -	go32)
   2.276 -		basic_machine=i386-pc
   2.277 -		os=-go32
   2.278 -		;;
   2.279  	h3050r* | hiux*)
   2.280  		basic_machine=hppa1.1-hitachi
   2.281  		os=-hiuxwe2
   2.282 @@ -504,6 +426,7 @@
   2.283  		;;
   2.284  	i370-ibm* | ibm*)
   2.285  		basic_machine=i370-ibm
   2.286 +		os=-mvs
   2.287  		;;
   2.288  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
   2.289  	i[34567]86v32)
   2.290 @@ -530,6 +453,14 @@
   2.291  		basic_machine=i386-unknown
   2.292  		os=-vsta
   2.293  		;;
   2.294 +	i386-go32 | go32)
   2.295 +		basic_machine=i386-unknown
   2.296 +		os=-go32
   2.297 +		;;
   2.298 +	i386-mingw32 | mingw32)
   2.299 +		basic_machine=i386-unknown
   2.300 +		os=-mingw32
   2.301 +		;;
   2.302  	iris | iris4d)
   2.303  		basic_machine=mips-sgi
   2.304  		case $os in
   2.305 @@ -555,14 +486,10 @@
   2.306  		basic_machine=ns32k-utek
   2.307  		os=-sysv
   2.308  		;;
   2.309 -	mingw32)
   2.310 -		basic_machine=i386-pc
   2.311 -		os=-mingw32
   2.312 -		;;
   2.313  	miniframe)
   2.314  		basic_machine=m68000-convergent
   2.315  		;;
   2.316 -	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
   2.317 +	*mint | *MiNT)
   2.318  		basic_machine=m68k-atari
   2.319  		os=-mint
   2.320  		;;
   2.321 @@ -580,22 +507,14 @@
   2.322  	mips3*)
   2.323  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
   2.324  		;;
   2.325 -	mmix*)
   2.326 -		basic_machine=mmix-knuth
   2.327 -		os=-mmixware
   2.328 -		;;
   2.329  	monitor)
   2.330  		basic_machine=m68k-rom68k
   2.331  		os=-coff
   2.332  		;;
   2.333  	msdos)
   2.334 -		basic_machine=i386-pc
   2.335 +		basic_machine=i386-unknown
   2.336  		os=-msdos
   2.337  		;;
   2.338 -	mvs)
   2.339 -		basic_machine=i370-ibm
   2.340 -		os=-mvs
   2.341 -		;;
   2.342  	ncr3000)
   2.343  		basic_machine=i486-ncr
   2.344  		os=-sysv4
   2.345 @@ -605,7 +524,7 @@
   2.346  		os=-netbsd
   2.347  		;;
   2.348  	netwinder)
   2.349 -		basic_machine=armv4l-rebel
   2.350 +		basic_machine=armv4l-corel
   2.351  		os=-linux
   2.352  		;;
   2.353  	news | news700 | news800 | news900)
   2.354 @@ -653,16 +572,9 @@
   2.355  		basic_machine=i960-intel
   2.356  		os=-mon960
   2.357  		;;
   2.358 -	nonstopux)
   2.359 -		basic_machine=mips-compaq
   2.360 -		os=-nonstopux
   2.361 -		;;
   2.362  	np1)
   2.363  		basic_machine=np1-gould
   2.364  		;;
   2.365 -	nsr-tandem)
   2.366 -		basic_machine=nsr-tandem
   2.367 -		;;
   2.368  	op50n-* | op60c-*)
   2.369  		basic_machine=hppa1.1-oki
   2.370  		os=-proelf
   2.371 @@ -692,28 +604,28 @@
   2.372          pc532 | pc532-*)
   2.373  		basic_machine=ns32k-pc532
   2.374  		;;
   2.375 -	pentium | p5 | k5 | k6 | nexgen)
   2.376 +	pentium | p5 | k5 | k6 | nexen)
   2.377  		basic_machine=i586-pc
   2.378  		;;
   2.379 -	pentiumpro | p6 | 6x86 | athlon)
   2.380 +	pentiumpro | p6 | 6x86)
   2.381  		basic_machine=i686-pc
   2.382  		;;
   2.383  	pentiumii | pentium2)
   2.384 -		basic_machine=i686-pc
   2.385 +		basic_machine=i786-pc
   2.386  		;;
   2.387 -	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
   2.388 +	pentium-* | p5-* | k5-* | k6-* | nexen-*)
   2.389  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.390  		;;
   2.391 -	pentiumpro-* | p6-* | 6x86-* | athlon-*)
   2.392 +	pentiumpro-* | p6-* | 6x86-*)
   2.393  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.394  		;;
   2.395  	pentiumii-* | pentium2-*)
   2.396 -		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.397 +		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.398  		;;
   2.399  	pn)
   2.400  		basic_machine=pn-gould
   2.401  		;;
   2.402 -	power)	basic_machine=power-ibm
   2.403 +	power)	basic_machine=rs6000-ibm
   2.404  		;;
   2.405  	ppc)	basic_machine=powerpc-unknown
   2.406  	        ;;
   2.407 @@ -728,10 +640,6 @@
   2.408  	ps2)
   2.409  		basic_machine=i386-ibm
   2.410  		;;
   2.411 -	pw32)
   2.412 -		basic_machine=i586-unknown
   2.413 -		os=-pw32
   2.414 -		;;
   2.415  	rom68k)
   2.416  		basic_machine=m68k-rom68k
   2.417  		os=-coff
   2.418 @@ -811,10 +719,6 @@
   2.419  	sun386 | sun386i | roadrunner)
   2.420  		basic_machine=i386-sun
   2.421  		;;
   2.422 -	sv1)
   2.423 -		basic_machine=sv1-cray
   2.424 -		os=-unicos
   2.425 -		;;
   2.426  	symmetry)
   2.427  		basic_machine=i386-sequent
   2.428  		os=-dynix
   2.429 @@ -823,10 +727,6 @@
   2.430  		basic_machine=t3e-cray
   2.431  		os=-unicos
   2.432  		;;
   2.433 -	tic54x | c54x*)
   2.434 -		basic_machine=tic54x-unknown
   2.435 -		os=-coff
   2.436 -		;;
   2.437  	tx39)
   2.438  		basic_machine=mipstx39-unknown
   2.439  		;;
   2.440 @@ -922,19 +822,12 @@
   2.441  	vax)
   2.442  		basic_machine=vax-dec
   2.443  		;;
   2.444 -	pdp10)
   2.445 -		# there are many clones, so DEC is not a safe bet
   2.446 -		basic_machine=pdp10-unknown
   2.447 -		;;
   2.448  	pdp11)
   2.449  		basic_machine=pdp11-dec
   2.450  		;;
   2.451  	we32k)
   2.452  		basic_machine=we32k-att
   2.453  		;;
   2.454 -	sh3 | sh4)
   2.455 -		basic_machine=sh-unknown
   2.456 -		;;
   2.457  	sparc | sparcv9)
   2.458  		basic_machine=sparc-sun
   2.459  		;;
   2.460 @@ -1015,26 +908,12 @@
   2.461  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
   2.462  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
   2.463  	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
   2.464 -	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
   2.465 -	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
   2.466 -	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
   2.467 +	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
   2.468  	# Remember, each alternative MUST END IN *, to match a version number.
   2.469  		;;
   2.470 -	-qnx*)
   2.471 -		case $basic_machine in
   2.472 -		    x86-* | i[34567]86-*)
   2.473 -			;;
   2.474 -		    *)
   2.475 -			os=-nto$os
   2.476 -			;;
   2.477 -		esac
   2.478 -		;;
   2.479 -	-nto*)
   2.480 -		os=-nto-qnx
   2.481 -		;;
   2.482  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
   2.483  	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
   2.484 -	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
   2.485 +	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
   2.486  		;;
   2.487  	-mac*)
   2.488  		os=`echo $os | sed -e 's|mac|macos|'`
   2.489 @@ -1048,12 +927,6 @@
   2.490  	-sunos6*)
   2.491  		os=`echo $os | sed -e 's|sunos6|solaris3|'`
   2.492  		;;
   2.493 -	-opened*)
   2.494 -		os=-openedition
   2.495 -		;;
   2.496 -	-wince*)
   2.497 -		os=-wince
   2.498 -		;;
   2.499  	-osfrose*)
   2.500  		os=-osfrose
   2.501  		;;
   2.502 @@ -1078,9 +951,6 @@
   2.503  	-ns2 )
   2.504  	        os=-nextstep2
   2.505  		;;
   2.506 -	-nsk*)
   2.507 -		os=-nsk
   2.508 -		;;
   2.509  	# Preserve the version number of sinix5.
   2.510  	-sinix5.*)
   2.511  		os=`echo $os | sed -e 's|sinix|sysv|'`
   2.512 @@ -1115,7 +985,7 @@
   2.513  	-xenix)
   2.514  		os=-xenix
   2.515  		;;
   2.516 -        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
   2.517 +        -*mint | -*MiNT)
   2.518  	        os=-mint
   2.519  		;;
   2.520  	-none)
   2.521 @@ -1143,15 +1013,12 @@
   2.522  	*-acorn)
   2.523  		os=-riscix1.2
   2.524  		;;
   2.525 -	arm*-rebel)
   2.526 +	arm*-corel)
   2.527  		os=-linux
   2.528  		;;
   2.529  	arm*-semi)
   2.530  		os=-aout
   2.531  		;;
   2.532 -	pdp10-*)
   2.533 -		os=-tops20
   2.534 -		;;
   2.535          pdp11-*)
   2.536  		os=-none
   2.537  		;;
   2.538 @@ -1260,7 +1127,7 @@
   2.539  	*-masscomp)
   2.540  		os=-rtu
   2.541  		;;
   2.542 -	f30[01]-fujitsu | f700-fujitsu)
   2.543 +	f301-fujitsu)
   2.544  		os=-uxpv
   2.545  		;;
   2.546  	*-rom68k)
   2.547 @@ -1320,7 +1187,7 @@
   2.548  			-genix*)
   2.549  				vendor=ns
   2.550  				;;
   2.551 -			-mvs* | -opened*)
   2.552 +			-mvs*)
   2.553  				vendor=ibm
   2.554  				;;
   2.555  			-ptx*)
   2.556 @@ -1338,7 +1205,7 @@
   2.557  			-mpw* | -macos*)
   2.558  				vendor=apple
   2.559  				;;
   2.560 -			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
   2.561 +			-*mint | -*MiNT)
   2.562  				vendor=atari
   2.563  				;;
   2.564  		esac
   2.565 @@ -1347,11 +1214,3 @@
   2.566  esac
   2.567  
   2.568  echo $basic_machine$os
   2.569 -exit 0
   2.570 -
   2.571 -# Local variables:
   2.572 -# eval: (add-hook 'write-file-hooks 'time-stamp)
   2.573 -# time-stamp-start: "timestamp='"
   2.574 -# time-stamp-format: "%:y-%02m-%02d"
   2.575 -# time-stamp-end: "'"
   2.576 -# End: