config.sub
changeset 53 25dfe480c75e
parent 28 6e53ad1f461e
child 729 dac996d69abb
     1.1 --- a/config.sub	Sun Jun 10 05:02:38 2001 +0000
     1.2 +++ b/config.sub	Sun Jun 10 18:20:23 2001 +0000
     1.3 @@ -1,6 +1,10 @@
     1.4  #! /bin/sh
     1.5 -# Configuration validation subroutine script, version 1.1.
     1.6 -#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
     1.7 +# Configuration validation subroutine script.
     1.8 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
     1.9 +#   Free Software Foundation, Inc.
    1.10 +
    1.11 +timestamp='2001-03-19'
    1.12 +
    1.13  # This file is (in principle) common to ALL GNU software.
    1.14  # The presence of a machine in this file suggests that SOME GNU software
    1.15  # can handle that machine.  It does not imply ALL GNU software can.
    1.16 @@ -25,6 +29,8 @@
    1.17  # configuration script generated by Autoconf, you may include it under
    1.18  # the same distribution terms that you use for the rest of that program.
    1.19  
    1.20 +# Please send patches to <config-patches@gnu.org>.
    1.21 +#
    1.22  # Configuration subroutine to validate and canonicalize a configuration type.
    1.23  # Supply the specified configuration type as an argument.
    1.24  # If it is invalid, we print an error message on stderr and exit with code 1.
    1.25 @@ -45,30 +51,73 @@
    1.26  #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
    1.27  # It is wrong to echo any other type of specification.
    1.28  
    1.29 -if [ x$1 = x ]
    1.30 -then
    1.31 -	echo Configuration name missing. 1>&2
    1.32 -	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
    1.33 -	echo "or     $0 ALIAS" 1>&2
    1.34 -	echo where ALIAS is a recognized configuration type. 1>&2
    1.35 -	exit 1
    1.36 -fi
    1.37 +me=`echo "$0" | sed -e 's,.*/,,'`
    1.38  
    1.39 -# First pass through any local machine types.
    1.40 -case $1 in
    1.41 -	*local*)
    1.42 -		echo $1
    1.43 -		exit 0
    1.44 -		;;
    1.45 -	*)
    1.46 -	;;
    1.47 +usage="\
    1.48 +Usage: $0 [OPTION] CPU-MFR-OPSYS
    1.49 +       $0 [OPTION] ALIAS
    1.50 +
    1.51 +Canonicalize a configuration name.
    1.52 +
    1.53 +Operation modes:
    1.54 +  -h, --help         print this help, then exit
    1.55 +  -t, --time-stamp   print date of last modification, then exit
    1.56 +  -v, --version      print version number, then exit
    1.57 +
    1.58 +Report bugs and patches to <config-patches@gnu.org>."
    1.59 +
    1.60 +version="\
    1.61 +GNU config.sub ($timestamp)
    1.62 +
    1.63 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
    1.64 +Free Software Foundation, Inc.
    1.65 +
    1.66 +This is free software; see the source for copying conditions.  There is NO
    1.67 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    1.68 +
    1.69 +help="
    1.70 +Try \`$me --help' for more information."
    1.71 +
    1.72 +# Parse command line
    1.73 +while test $# -gt 0 ; do
    1.74 +  case $1 in
    1.75 +    --time-stamp | --time* | -t )
    1.76 +       echo "$timestamp" ; exit 0 ;;
    1.77 +    --version | -v )
    1.78 +       echo "$version" ; exit 0 ;;
    1.79 +    --help | --h* | -h )
    1.80 +       echo "$usage"; exit 0 ;;
    1.81 +    -- )     # Stop option processing
    1.82 +       shift; break ;;
    1.83 +    - )	# Use stdin as input.
    1.84 +       break ;;
    1.85 +    -* )
    1.86 +       echo "$me: invalid option $1$help"
    1.87 +       exit 1 ;;
    1.88 +
    1.89 +    *local*)
    1.90 +       # First pass through any local machine types.
    1.91 +       echo $1
    1.92 +       exit 0;;
    1.93 +
    1.94 +    * )
    1.95 +       break ;;
    1.96 +  esac
    1.97 +done
    1.98 +
    1.99 +case $# in
   1.100 + 0) echo "$me: missing argument$help" >&2
   1.101 +    exit 1;;
   1.102 + 1) ;;
   1.103 + *) echo "$me: too many arguments$help" >&2
   1.104 +    exit 1;;
   1.105  esac
   1.106  
   1.107  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
   1.108  # Here we must recognize all the valid KERNEL-OS combinations.
   1.109  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   1.110  case $maybe_os in
   1.111 -  linux-gnu*)
   1.112 +  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
   1.113      os=-$maybe_os
   1.114      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
   1.115      ;;
   1.116 @@ -94,7 +143,7 @@
   1.117  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   1.118  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   1.119  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
   1.120 -	-apple)
   1.121 +	-apple | -axis)
   1.122  		os=
   1.123  		basic_machine=$1
   1.124  		;;
   1.125 @@ -105,7 +154,7 @@
   1.126  	-scout)
   1.127  		;;
   1.128  	-wrs)
   1.129 -		os=vxworks
   1.130 +		os=-vxworks
   1.131  		basic_machine=$1
   1.132  		;;
   1.133  	-hiux*)
   1.134 @@ -156,33 +205,49 @@
   1.135  	-psos*)
   1.136  		os=-psos
   1.137  		;;
   1.138 +	-mint | -mint[0-9]*)
   1.139 +		basic_machine=m68k-atari
   1.140 +		os=-mint
   1.141 +		;;
   1.142  esac
   1.143  
   1.144  # Decode aliases for certain CPU-COMPANY combinations.
   1.145  case $basic_machine in
   1.146  	# Recognize the basic CPU types without company name.
   1.147  	# Some are omitted here because they have special meanings below.
   1.148 -	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
   1.149 -		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
   1.150 +	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
   1.151 +	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
   1.152 +		| pyramid | mn10200 | mn10300 | tron | a29k \
   1.153  		| 580 | i960 | h8300 \
   1.154 +		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
   1.155  		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
   1.156 -		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
   1.157 -		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
   1.158 -		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
   1.159 +		| hppa64 \
   1.160 +		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
   1.161 +		| alphaev6[78] \
   1.162 +		| we32k | ns16k | clipper | i370 | sh | sh[34] \
   1.163 +		| powerpc | powerpcle \
   1.164 +		| 1750a | dsp16xx | pdp10 | pdp11 \
   1.165 +		| mips16 | mips64 | mipsel | mips64el \
   1.166  		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
   1.167  		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
   1.168 -		| mips64vr5000 | miprs64vr5000el \
   1.169 -		| armv[34][lb] | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
   1.170 -		| thumb | d10v)
   1.171 +		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
   1.172 +		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
   1.173 +		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
   1.174 +		| pj | pjl | h8500)
   1.175  		basic_machine=$basic_machine-unknown
   1.176  		;;
   1.177 -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
   1.178 +	m6811 | m68hc11 | m6812 | m68hc12)
   1.179 +		# Motorola 68HC11/12.
   1.180 +		basic_machine=$basic_machine-unknown
   1.181 +		os=-none
   1.182 +		;;
   1.183 +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
   1.184  		;;
   1.185  
   1.186  	# We use `pc' rather than `unknown'
   1.187  	# because (1) that's what they normally are, and
   1.188  	# (2) the word "unknown" tends to confuse beginning users.
   1.189 -	i[34567]86)
   1.190 +	i[234567]86 | x86_64)
   1.191  	  basic_machine=$basic_machine-pc
   1.192  	  ;;
   1.193  	# Object if more than one company name word.
   1.194 @@ -191,24 +256,30 @@
   1.195  		exit 1
   1.196  		;;
   1.197  	# Recognize the basic CPU types with company name.
   1.198 -	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
   1.199 -	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
   1.200 +	# FIXME: clean up the formatting here.
   1.201 +	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
   1.202 +	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
   1.203 +	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
   1.204  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
   1.205  	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
   1.206  	      | xmp-* | ymp-* \
   1.207 -	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
   1.208 -	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
   1.209 +	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
   1.210 +	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
   1.211 +	      | hppa2.0n-* | hppa64-* \
   1.212 +	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
   1.213 +	      | alphaev6[78]-* \
   1.214  	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
   1.215  	      | clipper-* | orion-* \
   1.216 -	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
   1.217 +	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
   1.218  	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
   1.219  	      | mips64el-* | mips64orion-* | mips64orionel-* \
   1.220  	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
   1.221 -	      | mipstx39-* | mipstx39el-* \
   1.222 -	      | armv[34][lb]-* \
   1.223 -	      | f301-* | armv*-* | t3e-* \
   1.224 +	      | mipstx39-* | mipstx39el-* | mcore-* \
   1.225 +	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
   1.226 +	      | [cjt]90-* \
   1.227  	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
   1.228 -	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
   1.229 +	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
   1.230 +	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
   1.231  		;;
   1.232  	# Recognize the various machine names and aliases which stand
   1.233  	# for a CPU type and a company and sometimes even an OS.
   1.234 @@ -245,14 +316,14 @@
   1.235  		os=-sysv
   1.236  		;;
   1.237  	amiga | amiga-*)
   1.238 -		basic_machine=m68k-cbm
   1.239 +		basic_machine=m68k-unknown
   1.240  		;;
   1.241  	amigaos | amigados)
   1.242 -		basic_machine=m68k-cbm
   1.243 +		basic_machine=m68k-unknown
   1.244  		os=-amigaos
   1.245  		;;
   1.246  	amigaunix | amix)
   1.247 -		basic_machine=m68k-cbm
   1.248 +		basic_machine=m68k-unknown
   1.249  		os=-sysv4
   1.250  		;;
   1.251  	apollo68)
   1.252 @@ -299,13 +370,16 @@
   1.253  		basic_machine=cray2-cray
   1.254  		os=-unicos
   1.255  		;;
   1.256 -	[ctj]90-cray)
   1.257 -		basic_machine=c90-cray
   1.258 +	[cjt]90)
   1.259 +		basic_machine=${basic_machine}-cray
   1.260  		os=-unicos
   1.261  		;;
   1.262  	crds | unos)
   1.263  		basic_machine=m68k-crds
   1.264  		;;
   1.265 +	cris | cris-* | etrax*)
   1.266 +		basic_machine=cris-axis
   1.267 +		;;
   1.268  	da30 | da30-*)
   1.269  		basic_machine=m68k-da30
   1.270  		;;
   1.271 @@ -353,6 +427,10 @@
   1.272  		basic_machine=tron-gmicro
   1.273  		os=-sysv
   1.274  		;;
   1.275 +	go32)
   1.276 +		basic_machine=i386-pc
   1.277 +		os=-go32
   1.278 +		;;
   1.279  	h3050r* | hiux*)
   1.280  		basic_machine=hppa1.1-hitachi
   1.281  		os=-hiuxwe2
   1.282 @@ -426,7 +504,6 @@
   1.283  		;;
   1.284  	i370-ibm* | ibm*)
   1.285  		basic_machine=i370-ibm
   1.286 -		os=-mvs
   1.287  		;;
   1.288  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
   1.289  	i[34567]86v32)
   1.290 @@ -453,14 +530,6 @@
   1.291  		basic_machine=i386-unknown
   1.292  		os=-vsta
   1.293  		;;
   1.294 -	i386-go32 | go32)
   1.295 -		basic_machine=i386-unknown
   1.296 -		os=-go32
   1.297 -		;;
   1.298 -	i386-mingw32 | mingw32)
   1.299 -		basic_machine=i386-unknown
   1.300 -		os=-mingw32
   1.301 -		;;
   1.302  	iris | iris4d)
   1.303  		basic_machine=mips-sgi
   1.304  		case $os in
   1.305 @@ -486,10 +555,14 @@
   1.306  		basic_machine=ns32k-utek
   1.307  		os=-sysv
   1.308  		;;
   1.309 +	mingw32)
   1.310 +		basic_machine=i386-pc
   1.311 +		os=-mingw32
   1.312 +		;;
   1.313  	miniframe)
   1.314  		basic_machine=m68000-convergent
   1.315  		;;
   1.316 -	*mint | *MiNT)
   1.317 +	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
   1.318  		basic_machine=m68k-atari
   1.319  		os=-mint
   1.320  		;;
   1.321 @@ -507,14 +580,22 @@
   1.322  	mips3*)
   1.323  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
   1.324  		;;
   1.325 +	mmix*)
   1.326 +		basic_machine=mmix-knuth
   1.327 +		os=-mmixware
   1.328 +		;;
   1.329  	monitor)
   1.330  		basic_machine=m68k-rom68k
   1.331  		os=-coff
   1.332  		;;
   1.333  	msdos)
   1.334 -		basic_machine=i386-unknown
   1.335 +		basic_machine=i386-pc
   1.336  		os=-msdos
   1.337  		;;
   1.338 +	mvs)
   1.339 +		basic_machine=i370-ibm
   1.340 +		os=-mvs
   1.341 +		;;
   1.342  	ncr3000)
   1.343  		basic_machine=i486-ncr
   1.344  		os=-sysv4
   1.345 @@ -524,7 +605,7 @@
   1.346  		os=-netbsd
   1.347  		;;
   1.348  	netwinder)
   1.349 -		basic_machine=armv4l-corel
   1.350 +		basic_machine=armv4l-rebel
   1.351  		os=-linux
   1.352  		;;
   1.353  	news | news700 | news800 | news900)
   1.354 @@ -572,9 +653,16 @@
   1.355  		basic_machine=i960-intel
   1.356  		os=-mon960
   1.357  		;;
   1.358 +	nonstopux)
   1.359 +		basic_machine=mips-compaq
   1.360 +		os=-nonstopux
   1.361 +		;;
   1.362  	np1)
   1.363  		basic_machine=np1-gould
   1.364  		;;
   1.365 +	nsr-tandem)
   1.366 +		basic_machine=nsr-tandem
   1.367 +		;;
   1.368  	op50n-* | op60c-*)
   1.369  		basic_machine=hppa1.1-oki
   1.370  		os=-proelf
   1.371 @@ -604,28 +692,28 @@
   1.372          pc532 | pc532-*)
   1.373  		basic_machine=ns32k-pc532
   1.374  		;;
   1.375 -	pentium | p5 | k5 | k6 | nexen)
   1.376 +	pentium | p5 | k5 | k6 | nexgen)
   1.377  		basic_machine=i586-pc
   1.378  		;;
   1.379 -	pentiumpro | p6 | 6x86)
   1.380 +	pentiumpro | p6 | 6x86 | athlon)
   1.381  		basic_machine=i686-pc
   1.382  		;;
   1.383  	pentiumii | pentium2)
   1.384 -		basic_machine=i786-pc
   1.385 +		basic_machine=i686-pc
   1.386  		;;
   1.387 -	pentium-* | p5-* | k5-* | k6-* | nexen-*)
   1.388 +	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
   1.389  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.390  		;;
   1.391 -	pentiumpro-* | p6-* | 6x86-*)
   1.392 +	pentiumpro-* | p6-* | 6x86-* | athlon-*)
   1.393  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.394  		;;
   1.395  	pentiumii-* | pentium2-*)
   1.396 -		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.397 +		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.398  		;;
   1.399  	pn)
   1.400  		basic_machine=pn-gould
   1.401  		;;
   1.402 -	power)	basic_machine=rs6000-ibm
   1.403 +	power)	basic_machine=power-ibm
   1.404  		;;
   1.405  	ppc)	basic_machine=powerpc-unknown
   1.406  	        ;;
   1.407 @@ -640,6 +728,10 @@
   1.408  	ps2)
   1.409  		basic_machine=i386-ibm
   1.410  		;;
   1.411 +	pw32)
   1.412 +		basic_machine=i586-unknown
   1.413 +		os=-pw32
   1.414 +		;;
   1.415  	rom68k)
   1.416  		basic_machine=m68k-rom68k
   1.417  		os=-coff
   1.418 @@ -719,6 +811,10 @@
   1.419  	sun386 | sun386i | roadrunner)
   1.420  		basic_machine=i386-sun
   1.421  		;;
   1.422 +	sv1)
   1.423 +		basic_machine=sv1-cray
   1.424 +		os=-unicos
   1.425 +		;;
   1.426  	symmetry)
   1.427  		basic_machine=i386-sequent
   1.428  		os=-dynix
   1.429 @@ -727,6 +823,10 @@
   1.430  		basic_machine=t3e-cray
   1.431  		os=-unicos
   1.432  		;;
   1.433 +	tic54x | c54x*)
   1.434 +		basic_machine=tic54x-unknown
   1.435 +		os=-coff
   1.436 +		;;
   1.437  	tx39)
   1.438  		basic_machine=mipstx39-unknown
   1.439  		;;
   1.440 @@ -822,12 +922,19 @@
   1.441  	vax)
   1.442  		basic_machine=vax-dec
   1.443  		;;
   1.444 +	pdp10)
   1.445 +		# there are many clones, so DEC is not a safe bet
   1.446 +		basic_machine=pdp10-unknown
   1.447 +		;;
   1.448  	pdp11)
   1.449  		basic_machine=pdp11-dec
   1.450  		;;
   1.451  	we32k)
   1.452  		basic_machine=we32k-att
   1.453  		;;
   1.454 +	sh3 | sh4)
   1.455 +		basic_machine=sh-unknown
   1.456 +		;;
   1.457  	sparc | sparcv9)
   1.458  		basic_machine=sparc-sun
   1.459  		;;
   1.460 @@ -908,12 +1015,26 @@
   1.461  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
   1.462  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
   1.463  	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
   1.464 -	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
   1.465 +	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
   1.466 +	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
   1.467 +	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
   1.468  	# Remember, each alternative MUST END IN *, to match a version number.
   1.469  		;;
   1.470 +	-qnx*)
   1.471 +		case $basic_machine in
   1.472 +		    x86-* | i[34567]86-*)
   1.473 +			;;
   1.474 +		    *)
   1.475 +			os=-nto$os
   1.476 +			;;
   1.477 +		esac
   1.478 +		;;
   1.479 +	-nto*)
   1.480 +		os=-nto-qnx
   1.481 +		;;
   1.482  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
   1.483  	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
   1.484 -	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
   1.485 +	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
   1.486  		;;
   1.487  	-mac*)
   1.488  		os=`echo $os | sed -e 's|mac|macos|'`
   1.489 @@ -927,6 +1048,12 @@
   1.490  	-sunos6*)
   1.491  		os=`echo $os | sed -e 's|sunos6|solaris3|'`
   1.492  		;;
   1.493 +	-opened*)
   1.494 +		os=-openedition
   1.495 +		;;
   1.496 +	-wince*)
   1.497 +		os=-wince
   1.498 +		;;
   1.499  	-osfrose*)
   1.500  		os=-osfrose
   1.501  		;;
   1.502 @@ -951,6 +1078,9 @@
   1.503  	-ns2 )
   1.504  	        os=-nextstep2
   1.505  		;;
   1.506 +	-nsk*)
   1.507 +		os=-nsk
   1.508 +		;;
   1.509  	# Preserve the version number of sinix5.
   1.510  	-sinix5.*)
   1.511  		os=`echo $os | sed -e 's|sinix|sysv|'`
   1.512 @@ -985,7 +1115,7 @@
   1.513  	-xenix)
   1.514  		os=-xenix
   1.515  		;;
   1.516 -        -*mint | -*MiNT)
   1.517 +        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
   1.518  	        os=-mint
   1.519  		;;
   1.520  	-none)
   1.521 @@ -1013,12 +1143,15 @@
   1.522  	*-acorn)
   1.523  		os=-riscix1.2
   1.524  		;;
   1.525 -	arm*-corel)
   1.526 +	arm*-rebel)
   1.527  		os=-linux
   1.528  		;;
   1.529  	arm*-semi)
   1.530  		os=-aout
   1.531  		;;
   1.532 +	pdp10-*)
   1.533 +		os=-tops20
   1.534 +		;;
   1.535          pdp11-*)
   1.536  		os=-none
   1.537  		;;
   1.538 @@ -1127,7 +1260,7 @@
   1.539  	*-masscomp)
   1.540  		os=-rtu
   1.541  		;;
   1.542 -	f301-fujitsu)
   1.543 +	f30[01]-fujitsu | f700-fujitsu)
   1.544  		os=-uxpv
   1.545  		;;
   1.546  	*-rom68k)
   1.547 @@ -1187,7 +1320,7 @@
   1.548  			-genix*)
   1.549  				vendor=ns
   1.550  				;;
   1.551 -			-mvs*)
   1.552 +			-mvs* | -opened*)
   1.553  				vendor=ibm
   1.554  				;;
   1.555  			-ptx*)
   1.556 @@ -1205,7 +1338,7 @@
   1.557  			-mpw* | -macos*)
   1.558  				vendor=apple
   1.559  				;;
   1.560 -			-*mint | -*MiNT)
   1.561 +			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
   1.562  				vendor=atari
   1.563  				;;
   1.564  		esac
   1.565 @@ -1214,3 +1347,11 @@
   1.566  esac
   1.567  
   1.568  echo $basic_machine$os
   1.569 +exit 0
   1.570 +
   1.571 +# Local variables:
   1.572 +# eval: (add-hook 'write-file-hooks 'time-stamp)
   1.573 +# time-stamp-start: "timestamp='"
   1.574 +# time-stamp-format: "%:y-%02m-%02d"
   1.575 +# time-stamp-end: "'"
   1.576 +# End: