patches/gcc/2.95.3/config.sub.patch
changeset 1 eeea35fbf182
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/gcc/2.95.3/config.sub.patch	Sat Feb 24 11:00:05 2007 +0000
     1.3 @@ -0,0 +1,1257 @@
     1.4 +# Backport from gcc-3.3.3
     1.5 +# Fixes errors like
     1.6 +#   Invalid configuration `x86_64-host_unknown-linux-gnu': machine `x86_64-host_unknown' not recognized
     1.7 +#   Unrecognized host system name x86_64-host_unknown-linux-gnu.
     1.8 +# when configuring on chip types or operating systems like x86_64 or Darwin
     1.9 +# which are newer than gcc-2.95
    1.10 +
    1.11 +--- gcc-2.95.3/config.sub.old	1999-08-04 01:09:26.000000000 -0700
    1.12 ++++ gcc-2.95.3/config.sub	2004-03-24 11:28:24.000000000 -0800
    1.13 +@@ -1,6 +1,10 @@
    1.14 + #! /bin/sh
    1.15 +-# Configuration validation subroutine script, version 1.1.
    1.16 +-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
    1.17 ++# Configuration validation subroutine script.
    1.18 ++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    1.19 ++#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    1.20 ++
    1.21 ++timestamp='2003-01-28'
    1.22 ++
    1.23 + # This file is (in principle) common to ALL GNU software.
    1.24 + # The presence of a machine in this file suggests that SOME GNU software
    1.25 + # can handle that machine.  It does not imply ALL GNU software can.
    1.26 +@@ -25,6 +29,9 @@
    1.27 + # configuration script generated by Autoconf, you may include it under
    1.28 + # the same distribution terms that you use for the rest of that program.
    1.29 + 
    1.30 ++# Please send patches to <config-patches@gnu.org>.  Submit a context
    1.31 ++# diff and a properly formatted ChangeLog entry.
    1.32 ++#
    1.33 + # Configuration subroutine to validate and canonicalize a configuration type.
    1.34 + # Supply the specified configuration type as an argument.
    1.35 + # If it is invalid, we print an error message on stderr and exit with code 1.
    1.36 +@@ -45,30 +52,73 @@
    1.37 + #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
    1.38 + # It is wrong to echo any other type of specification.
    1.39 + 
    1.40 +-if [ x$1 = x ]
    1.41 +-then
    1.42 +-	echo Configuration name missing. 1>&2
    1.43 +-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
    1.44 +-	echo "or     $0 ALIAS" 1>&2
    1.45 +-	echo where ALIAS is a recognized configuration type. 1>&2
    1.46 +-	exit 1
    1.47 +-fi
    1.48 ++me=`echo "$0" | sed -e 's,.*/,,'`
    1.49 + 
    1.50 +-# First pass through any local machine types.
    1.51 +-case $1 in
    1.52 +-	*local*)
    1.53 +-		echo $1
    1.54 +-		exit 0
    1.55 +-		;;
    1.56 +-	*)
    1.57 +-	;;
    1.58 ++usage="\
    1.59 ++Usage: $0 [OPTION] CPU-MFR-OPSYS
    1.60 ++       $0 [OPTION] ALIAS
    1.61 ++
    1.62 ++Canonicalize a configuration name.
    1.63 ++
    1.64 ++Operation modes:
    1.65 ++  -h, --help         print this help, then exit
    1.66 ++  -t, --time-stamp   print date of last modification, then exit
    1.67 ++  -v, --version      print version number, then exit
    1.68 ++
    1.69 ++Report bugs and patches to <config-patches@gnu.org>."
    1.70 ++
    1.71 ++version="\
    1.72 ++GNU config.sub ($timestamp)
    1.73 ++
    1.74 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
    1.75 ++Free Software Foundation, Inc.
    1.76 ++
    1.77 ++This is free software; see the source for copying conditions.  There is NO
    1.78 ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    1.79 ++
    1.80 ++help="
    1.81 ++Try \`$me --help' for more information."
    1.82 ++
    1.83 ++# Parse command line
    1.84 ++while test $# -gt 0 ; do
    1.85 ++  case $1 in
    1.86 ++    --time-stamp | --time* | -t )
    1.87 ++       echo "$timestamp" ; exit 0 ;;
    1.88 ++    --version | -v )
    1.89 ++       echo "$version" ; exit 0 ;;
    1.90 ++    --help | --h* | -h )
    1.91 ++       echo "$usage"; exit 0 ;;
    1.92 ++    -- )     # Stop option processing
    1.93 ++       shift; break ;;
    1.94 ++    - )	# Use stdin as input.
    1.95 ++       break ;;
    1.96 ++    -* )
    1.97 ++       echo "$me: invalid option $1$help"
    1.98 ++       exit 1 ;;
    1.99 ++
   1.100 ++    *local*)
   1.101 ++       # First pass through any local machine types.
   1.102 ++       echo $1
   1.103 ++       exit 0;;
   1.104 ++
   1.105 ++    * )
   1.106 ++       break ;;
   1.107 ++  esac
   1.108 ++done
   1.109 ++
   1.110 ++case $# in
   1.111 ++ 0) echo "$me: missing argument$help" >&2
   1.112 ++    exit 1;;
   1.113 ++ 1) ;;
   1.114 ++ *) echo "$me: too many arguments$help" >&2
   1.115 ++    exit 1;;
   1.116 + esac
   1.117 + 
   1.118 + # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
   1.119 + # Here we must recognize all the valid KERNEL-OS combinations.
   1.120 + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   1.121 + case $maybe_os in
   1.122 +-  linux-gnu*)
   1.123 ++  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
   1.124 +     os=-$maybe_os
   1.125 +     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
   1.126 +     ;;
   1.127 +@@ -94,20 +144,28 @@
   1.128 + 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   1.129 + 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   1.130 + 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
   1.131 +-	-apple)
   1.132 ++	-apple | -axis)
   1.133 + 		os=
   1.134 + 		basic_machine=$1
   1.135 + 		;;
   1.136 +-	-sim | -cisco | -oki | -wec | -winbond )	# EGCS LOCAL
   1.137 ++	-sim | -cisco | -oki | -wec | -winbond)
   1.138 + 		os=
   1.139 + 		basic_machine=$1
   1.140 + 		;;
   1.141 +-	-scout)						# EGCS LOCAL
   1.142 ++	-scout)
   1.143 + 		;;
   1.144 +-	-wrs)						# EGCS LOCAL
   1.145 ++	-wrs)
   1.146 + 		os=-vxworks
   1.147 + 		basic_machine=$1
   1.148 + 		;;
   1.149 ++	-chorusos*)
   1.150 ++		os=-chorusos
   1.151 ++		basic_machine=$1
   1.152 ++		;;
   1.153 ++ 	-chorusrdb)
   1.154 ++ 		os=-chorusrdb
   1.155 ++		basic_machine=$1
   1.156 ++ 		;;
   1.157 + 	-hiux*)
   1.158 + 		os=-hiuxwe2
   1.159 + 		;;
   1.160 +@@ -156,49 +214,72 @@
   1.161 + 	-psos*)
   1.162 + 		os=-psos
   1.163 + 		;;
   1.164 ++	-mint | -mint[0-9]*)
   1.165 ++		basic_machine=m68k-atari
   1.166 ++		os=-mint
   1.167 ++		;;
   1.168 + esac
   1.169 + 
   1.170 + # Decode aliases for certain CPU-COMPANY combinations.
   1.171 + case $basic_machine in
   1.172 + 	# Recognize the basic CPU types without company name.
   1.173 + 	# Some are omitted here because they have special meanings below.
   1.174 +-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
   1.175 +-		| arme[lb] | pyramid | mn10200 | mn10300 \
   1.176 +-		| tron | a29k | 580 | i960 | h8300 \
   1.177 +-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
   1.178 +-		| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
   1.179 +-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
   1.180 +-		| 1750a | dsp16xx | pdp11 \
   1.181 +-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
   1.182 +-		| mipstx39 | mipstx39el \
   1.183 +-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x)
   1.184 +-		basic_machine=$basic_machine-unknown
   1.185 +-		;;
   1.186 +-	m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
   1.187 +-	        | h8500 | w65) # EGCS LOCAL
   1.188 +-		;;
   1.189 +-	thumb)
   1.190 +-		basic_machine=$basic_machine-unknown
   1.191 +-		;;
   1.192 +-	mips64vr4300 | mips64vr4300el) # EGCS LOCAL jsmith/vr4300
   1.193 ++	1750a | 580 \
   1.194 ++	| a29k \
   1.195 ++	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
   1.196 ++	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
   1.197 ++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
   1.198 ++	| clipper \
   1.199 ++	| d10v | d30v | dlx | dsp16xx \
   1.200 ++	| fr30 | frv \
   1.201 ++	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
   1.202 ++	| i370 | i860 | i960 | ia64 \
   1.203 ++	| ip2k \
   1.204 ++	| m32r | m68000 | m68k | m88k | mcore \
   1.205 ++	| mips | mipsbe | mipseb | mipsel | mipsle \
   1.206 ++	| mips16 \
   1.207 ++	| mips64 | mips64el \
   1.208 ++	| mips64vr | mips64vrel \
   1.209 ++	| mips64orion | mips64orionel \
   1.210 ++	| mips64vr4100 | mips64vr4100el \
   1.211 ++	| mips64vr4300 | mips64vr4300el \
   1.212 ++	| mips64vr5000 | mips64vr5000el \
   1.213 ++	| mipsisa32 | mipsisa32el \
   1.214 ++	| mipsisa32r2 | mipsisa32r2el \
   1.215 ++	| mipsisa64 | mipsisa64el \
   1.216 ++	| mipsisa64sb1 | mipsisa64sb1el \
   1.217 ++	| mipsisa64sr71k | mipsisa64sr71kel \
   1.218 ++	| mipstx39 | mipstx39el \
   1.219 ++	| mn10200 | mn10300 \
   1.220 ++	| msp430 \
   1.221 ++	| ns16k | ns32k \
   1.222 ++	| openrisc | or32 \
   1.223 ++	| pdp10 | pdp11 | pj | pjl \
   1.224 ++	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
   1.225 ++	| pyramid \
   1.226 ++	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
   1.227 ++	| sh64 | sh64le \
   1.228 ++	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
   1.229 ++	| strongarm \
   1.230 ++	| tahoe | thumb | tic80 | tron \
   1.231 ++	| v850 | v850e \
   1.232 ++	| we32k \
   1.233 ++	| x86 | xscale | xstormy16 | xtensa \
   1.234 ++	| z8k)
   1.235 + 		basic_machine=$basic_machine-unknown
   1.236 + 		;;
   1.237 +-	mips64vr4100 | mips64vr4100el) # EGCS LOCAL jsmith/vr4100
   1.238 +-		basic_machine=$basic_machine-unknown
   1.239 +-		;;
   1.240 +-	mips64vr5000 | mips64vr5000el) # EGCS LOCAL ian/vr5000
   1.241 +-		basic_machine=$basic_machine-unknown
   1.242 +-		;;
   1.243 +-	mips16)
   1.244 ++	m6811 | m68hc11 | m6812 | m68hc12)
   1.245 ++		# Motorola 68HC11/12.
   1.246 + 		basic_machine=$basic_machine-unknown
   1.247 ++		os=-none
   1.248 + 		;;
   1.249 +-	d10v)
   1.250 +-		basic_machine=$basic_machine-unknown
   1.251 ++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
   1.252 + 		;;
   1.253 ++
   1.254 + 	# We use `pc' rather than `unknown'
   1.255 + 	# because (1) that's what they normally are, and
   1.256 + 	# (2) the word "unknown" tends to confuse beginning users.
   1.257 +-	i[34567]86)
   1.258 ++	i*86 | x86_64)
   1.259 + 	  basic_machine=$basic_machine-pc
   1.260 + 	  ;;
   1.261 + 	# Object if more than one company name word.
   1.262 +@@ -207,44 +288,62 @@
   1.263 + 		exit 1
   1.264 + 		;;
   1.265 + 	# Recognize the basic CPU types with company name.
   1.266 +-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
   1.267 +-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
   1.268 +-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
   1.269 +-	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
   1.270 +-	      | xmp-* | ymp-* \
   1.271 +-	      | hppa-* | hppa1.0-* | hppa1.1-* \
   1.272 +-	      | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
   1.273 +-	      | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* \
   1.274 +-	      | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
   1.275 +-	      | xps100-* | clipper-* | orion-* \
   1.276 +-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
   1.277 +-	      | sparc64-* | sparcv9-* | sparc86x-* | mips64-* | mipsel-* \
   1.278 +-	      | mips64el-* | mips64orion-* | mips64orionel-*  \
   1.279 +-	      | mipstx39-* | mipstx39el-* \
   1.280 +-	      | f301-* | arm*-*)
   1.281 +-		;;
   1.282 +-	m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-* | d10v-*) # EGCS LOCAL
   1.283 +-		;;
   1.284 +-	thumb-*) # EGCS LOCAL angela/thumb
   1.285 +-		;;
   1.286 +-	v850-*) # EGCS LOCAL
   1.287 +-	        ;;
   1.288 +-	d30v-*) # EGCS LOCAL
   1.289 +-	        ;;
   1.290 +-	mips64vr4300-* | mips64vr4300el-*) # EGCS LOCAL jsmith/vr4300
   1.291 +-		;;
   1.292 +-	mips64vr4100-* | mips64vr4100el-*) # EGCS LOCAL jsmith/vr4100
   1.293 +-		;;
   1.294 +-	mips16-*) # EGCS LOCAL krk/mips16
   1.295 +-		;;
   1.296 +-	tic30-*) # EGCS LOCAL ian/tic30
   1.297 +-		;;
   1.298 +-	c30-*) # EGCS LOCAL ian/tic30
   1.299 +-		basic_machine=tic30-unknown
   1.300 ++	580-* \
   1.301 ++	| a29k-* \
   1.302 ++	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
   1.303 ++	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
   1.304 ++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
   1.305 ++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
   1.306 ++	| avr-* \
   1.307 ++	| bs2000-* \
   1.308 ++	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
   1.309 ++	| clipper-* | cydra-* \
   1.310 ++	| d10v-* | d30v-* | dlx-* \
   1.311 ++	| elxsi-* \
   1.312 ++	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
   1.313 ++	| h8300-* | h8500-* \
   1.314 ++	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
   1.315 ++	| i*86-* | i860-* | i960-* | ia64-* \
   1.316 ++	| ip2k-* \
   1.317 ++	| m32r-* \
   1.318 ++	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
   1.319 ++	| m88110-* | m88k-* | mcore-* \
   1.320 ++	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
   1.321 ++	| mips16-* \
   1.322 ++	| mips64-* | mips64el-* \
   1.323 ++	| mips64vr-* | mips64vrel-* \
   1.324 ++	| mips64orion-* | mips64orionel-* \
   1.325 ++	| mips64vr4100-* | mips64vr4100el-* \
   1.326 ++	| mips64vr4300-* | mips64vr4300el-* \
   1.327 ++	| mips64vr5000-* | mips64vr5000el-* \
   1.328 ++	| mipsisa32-* | mipsisa32el-* \
   1.329 ++	| mipsisa32r2-* | mipsisa32r2el-* \
   1.330 ++	| mipsisa64-* | mipsisa64el-* \
   1.331 ++	| mipsisa64sb1-* | mipsisa64sb1el-* \
   1.332 ++	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
   1.333 ++	| mipstx39-* | mipstx39el-* \
   1.334 ++	| msp430-* \
   1.335 ++	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
   1.336 ++	| orion-* \
   1.337 ++	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
   1.338 ++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
   1.339 ++	| pyramid-* \
   1.340 ++	| romp-* | rs6000-* \
   1.341 ++	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
   1.342 ++	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
   1.343 ++	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
   1.344 ++	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
   1.345 ++	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
   1.346 ++	| v850-* | v850e-* | vax-* \
   1.347 ++	| we32k-* \
   1.348 ++	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
   1.349 ++	| xtensa-* \
   1.350 ++	| ymp-* \
   1.351 ++	| z8k-*)
   1.352 + 		;;
   1.353 + 	# Recognize the various machine names and aliases which stand
   1.354 + 	# for a CPU type and a company and sometimes even an OS.
   1.355 +-	386bsd)						# EGCS LOCAL
   1.356 ++	386bsd)
   1.357 + 		basic_machine=i386-unknown
   1.358 + 		os=-bsd
   1.359 + 		;;
   1.360 +@@ -254,11 +353,11 @@
   1.361 + 	3b*)
   1.362 + 		basic_machine=we32k-att
   1.363 + 		;;
   1.364 +-	a29khif)					# EGCS LOCAL
   1.365 ++	a29khif)
   1.366 + 		basic_machine=a29k-amd
   1.367 + 		os=-udi
   1.368 + 		;;
   1.369 +-	adobe68k)					# EGCS LOCAL
   1.370 ++	adobe68k)
   1.371 + 		basic_machine=m68010-adobe
   1.372 + 		os=-scout
   1.373 + 		;;
   1.374 +@@ -277,21 +376,21 @@
   1.375 + 		os=-sysv
   1.376 + 		;;
   1.377 + 	amiga | amiga-*)
   1.378 +-		basic_machine=m68k-cbm
   1.379 ++		basic_machine=m68k-unknown
   1.380 + 		;;
   1.381 + 	amigaos | amigados)
   1.382 +-		basic_machine=m68k-cbm
   1.383 ++		basic_machine=m68k-unknown
   1.384 + 		os=-amigaos
   1.385 + 		;;
   1.386 + 	amigaunix | amix)
   1.387 +-		basic_machine=m68k-cbm
   1.388 ++		basic_machine=m68k-unknown
   1.389 + 		os=-sysv4
   1.390 + 		;;
   1.391 + 	apollo68)
   1.392 + 		basic_machine=m68k-apollo
   1.393 + 		os=-sysv
   1.394 + 		;;
   1.395 +-	apollo68bsd)					# EGCS LOCAL
   1.396 ++	apollo68bsd)
   1.397 + 		basic_machine=m68k-apollo
   1.398 + 		os=-bsd
   1.399 + 		;;
   1.400 +@@ -303,6 +402,10 @@
   1.401 + 		basic_machine=ns32k-sequent
   1.402 + 		os=-dynix
   1.403 + 		;;
   1.404 ++	c90)
   1.405 ++		basic_machine=c90-cray
   1.406 ++		os=-unicos
   1.407 ++		;;
   1.408 + 	convex-c1)
   1.409 + 		basic_machine=c1-convex
   1.410 + 		os=-bsd
   1.411 +@@ -323,27 +426,30 @@
   1.412 + 		basic_machine=c38-convex
   1.413 + 		os=-bsd
   1.414 + 		;;
   1.415 +-	cray | ymp)
   1.416 +-		basic_machine=ymp-cray
   1.417 +-		os=-unicos
   1.418 +-		;;
   1.419 +-	cray2)
   1.420 +-		basic_machine=cray2-cray
   1.421 +-		os=-unicos
   1.422 +-		;;
   1.423 +-	[ctj]90-cray)
   1.424 +-		basic_machine=c90-cray
   1.425 ++	cray | j90)
   1.426 ++		basic_machine=j90-cray
   1.427 + 		os=-unicos
   1.428 + 		;;
   1.429 + 	crds | unos)
   1.430 + 		basic_machine=m68k-crds
   1.431 + 		;;
   1.432 ++	cris | cris-* | etrax*)
   1.433 ++		basic_machine=cris-axis
   1.434 ++		;;
   1.435 + 	da30 | da30-*)
   1.436 + 		basic_machine=m68k-da30
   1.437 + 		;;
   1.438 + 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
   1.439 + 		basic_machine=mips-dec
   1.440 + 		;;
   1.441 ++	decsystem10* | dec10*)
   1.442 ++		basic_machine=pdp10-dec
   1.443 ++		os=-tops10
   1.444 ++		;;
   1.445 ++	decsystem20* | dec20*)
   1.446 ++		basic_machine=pdp10-dec
   1.447 ++		os=-tops20
   1.448 ++		;;
   1.449 + 	delta | 3300 | motorola-3300 | motorola-delta \
   1.450 + 	      | 3300-motorola | delta-motorola)
   1.451 + 		basic_machine=m68k-motorola
   1.452 +@@ -371,7 +477,7 @@
   1.453 + 	encore | umax | mmax)
   1.454 + 		basic_machine=ns32k-encore
   1.455 + 		;;
   1.456 +-	es1800 | OSE68k | ose68k | ose | OSE)		# EGCS LOCAL
   1.457 ++	es1800 | OSE68k | ose68k | ose | OSE)
   1.458 + 		basic_machine=m68k-ericsson
   1.459 + 		os=-ose
   1.460 + 		;;
   1.461 +@@ -385,6 +491,10 @@
   1.462 + 		basic_machine=tron-gmicro
   1.463 + 		os=-sysv
   1.464 + 		;;
   1.465 ++	go32)
   1.466 ++		basic_machine=i386-pc
   1.467 ++		os=-go32
   1.468 ++		;;
   1.469 + 	h3050r* | hiux*)
   1.470 + 		basic_machine=hppa1.1-hitachi
   1.471 + 		os=-hiuxwe2
   1.472 +@@ -393,11 +503,11 @@
   1.473 + 		basic_machine=h8300-hitachi
   1.474 + 		os=-hms
   1.475 + 		;;
   1.476 +-	h8300xray)					# EGCS LOCAL
   1.477 ++	h8300xray)
   1.478 + 		basic_machine=h8300-hitachi
   1.479 + 		os=-xray
   1.480 + 		;;
   1.481 +-	h8500hms)					# EGCS LOCAL
   1.482 ++	h8500hms)
   1.483 + 		basic_machine=h8500-hitachi
   1.484 + 		os=-hms
   1.485 + 		;;
   1.486 +@@ -416,22 +526,6 @@
   1.487 + 		basic_machine=m68k-hp
   1.488 + 		os=-hpux
   1.489 + 		;;
   1.490 +-        w89k-*)						# EGCS LOCAL
   1.491 +-                basic_machine=hppa1.1-winbond
   1.492 +-                os=-proelf
   1.493 +-                ;;
   1.494 +-        op50n-*)					# EGCS LOCAL
   1.495 +-                basic_machine=hppa1.1-oki
   1.496 +-                os=-proelf
   1.497 +-                ;;
   1.498 +-        op60c-*)					# EGCS LOCAL
   1.499 +-                basic_machine=hppa1.1-oki
   1.500 +-                os=-proelf
   1.501 +-                ;;
   1.502 +-        hppro)						# EGCS LOCAL
   1.503 +-                basic_machine=hppa1.1-hp
   1.504 +-                os=-proelf
   1.505 +-                ;;
   1.506 + 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
   1.507 + 		basic_machine=hppa1.0-hp
   1.508 + 		;;
   1.509 +@@ -441,22 +535,21 @@
   1.510 + 	hp9k3[2-9][0-9])
   1.511 + 		basic_machine=m68k-hp
   1.512 + 		;;
   1.513 +-	hp9k6[0-9][0-9] | hp6[0-9][0-9] )
   1.514 ++	hp9k6[0-9][0-9] | hp6[0-9][0-9])
   1.515 + 		basic_machine=hppa1.0-hp
   1.516 + 		;;
   1.517 +-	hp9k7[0-79][0-9] | hp7[0-79][0-9] )
   1.518 ++	hp9k7[0-79][0-9] | hp7[0-79][0-9])
   1.519 + 		basic_machine=hppa1.1-hp
   1.520 + 		;;
   1.521 +-	hp9k78[0-9] | hp78[0-9] )
   1.522 ++	hp9k78[0-9] | hp78[0-9])
   1.523 + 		# FIXME: really hppa2.0-hp
   1.524 + 		basic_machine=hppa1.1-hp
   1.525 + 		;;
   1.526 +-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | \
   1.527 +-	hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893 )
   1.528 ++	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
   1.529 + 		# FIXME: really hppa2.0-hp
   1.530 + 		basic_machine=hppa1.1-hp
   1.531 + 		;;
   1.532 +-	hp9k8[0-9][13679] | hp8[0-9][13679] )
   1.533 ++	hp9k8[0-9][13679] | hp8[0-9][13679])
   1.534 + 		basic_machine=hppa1.1-hp
   1.535 + 		;;
   1.536 + 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
   1.537 +@@ -465,47 +558,42 @@
   1.538 + 	hppa-next)
   1.539 + 		os=-nextstep3
   1.540 + 		;;
   1.541 +-	hppaosf)					# EGCS LOCAL
   1.542 ++	hppaosf)
   1.543 + 		basic_machine=hppa1.1-hp
   1.544 + 		os=-osf
   1.545 + 		;;
   1.546 ++	hppro)
   1.547 ++		basic_machine=hppa1.1-hp
   1.548 ++		os=-proelf
   1.549 ++		;;
   1.550 + 	i370-ibm* | ibm*)
   1.551 + 		basic_machine=i370-ibm
   1.552 +-		os=-mvs
   1.553 + 		;;
   1.554 + # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
   1.555 +-	i[34567]86v32)
   1.556 ++	i*86v32)
   1.557 + 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   1.558 + 		os=-sysv32
   1.559 + 		;;
   1.560 +-	i[34567]86v4*)
   1.561 ++	i*86v4*)
   1.562 + 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   1.563 + 		os=-sysv4
   1.564 + 		;;
   1.565 +-	i[34567]86v)
   1.566 ++	i*86v)
   1.567 + 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   1.568 + 		os=-sysv
   1.569 + 		;;
   1.570 +-	i[34567]86sol2)
   1.571 ++	i*86sol2)
   1.572 + 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   1.573 + 		os=-solaris2
   1.574 + 		;;
   1.575 +-	i386mach)					# EGCS LOCAL
   1.576 ++	i386mach)
   1.577 + 		basic_machine=i386-mach
   1.578 + 		os=-mach
   1.579 + 		;;
   1.580 +-	i386-vsta | vsta)				# EGCS LOCAL
   1.581 ++	i386-vsta | vsta)
   1.582 + 		basic_machine=i386-unknown
   1.583 + 		os=-vsta
   1.584 + 		;;
   1.585 +-	i386-go32 | go32)				# EGCS LOCAL
   1.586 +-		basic_machine=i386-unknown
   1.587 +-		os=-go32
   1.588 +-		;;
   1.589 +-	i386-mingw32 | mingw32)
   1.590 +-		basic_machine=i386-unknown
   1.591 +-		os=-mingw32
   1.592 +-		;;
   1.593 + 	iris | iris4d)
   1.594 + 		basic_machine=mips-sgi
   1.595 + 		case $os in
   1.596 +@@ -531,16 +619,16 @@
   1.597 + 		basic_machine=ns32k-utek
   1.598 + 		os=-sysv
   1.599 + 		;;
   1.600 ++	mingw32)
   1.601 ++		basic_machine=i386-pc
   1.602 ++		os=-mingw32
   1.603 ++		;;
   1.604 + 	miniframe)
   1.605 + 		basic_machine=m68000-convergent
   1.606 + 		;;
   1.607 +-	mipsel*-linux*)
   1.608 +-		basic_machine=mipsel-unknown
   1.609 +-		os=-linux-gnu
   1.610 +-		;;
   1.611 +-	mips*-linux*)
   1.612 +-		basic_machine=mips-unknown
   1.613 +-		os=-linux-gnu
   1.614 ++	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
   1.615 ++		basic_machine=m68k-atari
   1.616 ++		os=-mint
   1.617 + 		;;
   1.618 + 	mips3*-*)
   1.619 + 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
   1.620 +@@ -548,24 +636,36 @@
   1.621 + 	mips3*)
   1.622 + 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
   1.623 + 		;;
   1.624 +-	monitor)					# EGCS LOCAL
   1.625 ++	mmix*)
   1.626 ++		basic_machine=mmix-knuth
   1.627 ++		os=-mmixware
   1.628 ++		;;
   1.629 ++	monitor)
   1.630 + 		basic_machine=m68k-rom68k
   1.631 + 		os=-coff
   1.632 + 		;;
   1.633 +-	msdos)						# EGCS LOCAL
   1.634 +-		basic_machine=i386-unknown	
   1.635 ++	morphos)
   1.636 ++		basic_machine=powerpc-unknown
   1.637 ++		os=-morphos
   1.638 ++		;;
   1.639 ++	msdos)
   1.640 ++		basic_machine=i386-pc
   1.641 + 		os=-msdos
   1.642 + 		;;
   1.643 ++	mvs)
   1.644 ++		basic_machine=i370-ibm
   1.645 ++		os=-mvs
   1.646 ++		;;
   1.647 + 	ncr3000)
   1.648 + 		basic_machine=i486-ncr
   1.649 + 		os=-sysv4
   1.650 + 		;;
   1.651 + 	netbsd386)
   1.652 +-		basic_machine=i386-unknown		# EGCS LOCAL
   1.653 ++		basic_machine=i386-unknown
   1.654 + 		os=-netbsd
   1.655 + 		;;
   1.656 + 	netwinder)
   1.657 +-		basic_machine=armv4l-corel
   1.658 ++		basic_machine=armv4l-rebel
   1.659 + 		os=-linux
   1.660 + 		;;
   1.661 + 	news | news700 | news800 | news900)
   1.662 +@@ -580,7 +680,7 @@
   1.663 + 		basic_machine=mips-sony
   1.664 + 		os=-newsos
   1.665 + 		;;
   1.666 +-	necv70)						# EGCS LOCAL
   1.667 ++	necv70)
   1.668 + 		basic_machine=v70-nec
   1.669 + 		os=-sysv
   1.670 + 		;;
   1.671 +@@ -609,18 +709,37 @@
   1.672 + 		basic_machine=i960-intel
   1.673 + 		os=-nindy
   1.674 + 		;;
   1.675 +-	mon960)						# EGCS LOCAL
   1.676 ++	mon960)
   1.677 + 		basic_machine=i960-intel
   1.678 + 		os=-mon960
   1.679 + 		;;
   1.680 ++	nonstopux)
   1.681 ++		basic_machine=mips-compaq
   1.682 ++		os=-nonstopux
   1.683 ++		;;
   1.684 + 	np1)
   1.685 + 		basic_machine=np1-gould
   1.686 + 		;;
   1.687 +-	OSE68000 | ose68000)				# EGCS LOCAL
   1.688 ++	nv1)
   1.689 ++		basic_machine=nv1-cray
   1.690 ++		os=-unicosmp
   1.691 ++		;;
   1.692 ++	nsr-tandem)
   1.693 ++		basic_machine=nsr-tandem
   1.694 ++		;;
   1.695 ++	op50n-* | op60c-*)
   1.696 ++		basic_machine=hppa1.1-oki
   1.697 ++		os=-proelf
   1.698 ++		;;
   1.699 ++	or32 | or32-*)
   1.700 ++		basic_machine=or32-unknown
   1.701 ++		os=-coff
   1.702 ++		;;
   1.703 ++	OSE68000 | ose68000)
   1.704 + 		basic_machine=m68000-ericsson
   1.705 + 		os=-ose
   1.706 + 		;;
   1.707 +-	os68k)						# EGCS LOCAL
   1.708 ++	os68k)
   1.709 + 		basic_machine=m68k-none
   1.710 + 		os=-os68k
   1.711 + 		;;
   1.712 +@@ -638,46 +757,60 @@
   1.713 + 	pbb)
   1.714 + 		basic_machine=m68k-tti
   1.715 + 		;;
   1.716 +-        pc532 | pc532-*)
   1.717 ++	pc532 | pc532-*)
   1.718 + 		basic_machine=ns32k-pc532
   1.719 + 		;;
   1.720 +-	pentium | p5 | k5 | k6 | nexen)
   1.721 ++	pentium | p5 | k5 | k6 | nexgen | viac3)
   1.722 + 		basic_machine=i586-pc
   1.723 + 		;;
   1.724 +-	pentiumpro | p6 | 6x86)
   1.725 ++	pentiumpro | p6 | 6x86 | athlon | athlon_*)
   1.726 + 		basic_machine=i686-pc
   1.727 + 		;;
   1.728 + 	pentiumii | pentium2)
   1.729 +-		basic_machine=i786-pc
   1.730 ++		basic_machine=i686-pc
   1.731 + 		;;
   1.732 +-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
   1.733 ++	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
   1.734 + 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.735 + 		;;
   1.736 +-	pentiumpro-* | p6-* | 6x86-*)
   1.737 ++	pentiumpro-* | p6-* | 6x86-* | athlon-*)
   1.738 + 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.739 + 		;;
   1.740 + 	pentiumii-* | pentium2-*)
   1.741 +-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.742 ++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.743 + 		;;
   1.744 + 	pn)
   1.745 + 		basic_machine=pn-gould
   1.746 + 		;;
   1.747 +-	power)	basic_machine=rs6000-ibm
   1.748 ++	power)	basic_machine=power-ibm
   1.749 + 		;;
   1.750 + 	ppc)	basic_machine=powerpc-unknown
   1.751 +-	        ;;
   1.752 ++		;;
   1.753 + 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.754 + 		;;
   1.755 + 	ppcle | powerpclittle | ppc-le | powerpc-little)
   1.756 + 		basic_machine=powerpcle-unknown
   1.757 +-	        ;;
   1.758 ++		;;
   1.759 + 	ppcle-* | powerpclittle-*)
   1.760 + 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.761 + 		;;
   1.762 ++	ppc64)	basic_machine=powerpc64-unknown
   1.763 ++		;;
   1.764 ++	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.765 ++		;;
   1.766 ++	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
   1.767 ++		basic_machine=powerpc64le-unknown
   1.768 ++		;;
   1.769 ++	ppc64le-* | powerpc64little-*)
   1.770 ++		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
   1.771 ++		;;
   1.772 + 	ps2)
   1.773 + 		basic_machine=i386-ibm
   1.774 + 		;;
   1.775 +-	rom68k)						# EGCS LOCAL
   1.776 ++	pw32)
   1.777 ++		basic_machine=i586-unknown
   1.778 ++		os=-pw32
   1.779 ++		;;
   1.780 ++	rom68k)
   1.781 + 		basic_machine=m68k-rom68k
   1.782 + 		os=-coff
   1.783 + 		;;
   1.784 +@@ -687,10 +820,22 @@
   1.785 + 	rtpc | rtpc-*)
   1.786 + 		basic_machine=romp-ibm
   1.787 + 		;;
   1.788 +-	sa29200)					# EGCS LOCAL
   1.789 ++	s390 | s390-*)
   1.790 ++		basic_machine=s390-ibm
   1.791 ++		;;
   1.792 ++	s390x | s390x-*)
   1.793 ++		basic_machine=s390x-ibm
   1.794 ++		;;
   1.795 ++	sa29200)
   1.796 + 		basic_machine=a29k-amd
   1.797 + 		os=-udi
   1.798 + 		;;
   1.799 ++	sb1)
   1.800 ++		basic_machine=mipsisa64sb1-unknown
   1.801 ++		;;
   1.802 ++	sb1el)
   1.803 ++		basic_machine=mipsisa64sb1el-unknown
   1.804 ++		;;
   1.805 + 	sequent)
   1.806 + 		basic_machine=i386-sequent
   1.807 + 		;;
   1.808 +@@ -698,7 +843,7 @@
   1.809 + 		basic_machine=sh-hitachi
   1.810 + 		os=-hms
   1.811 + 		;;
   1.812 +-	sparclite-wrs)					# EGCS LOCAL
   1.813 ++	sparclite-wrs | simso-wrs)
   1.814 + 		basic_machine=sparclite-wrs
   1.815 + 		os=-vxworks
   1.816 + 		;;
   1.817 +@@ -709,10 +854,10 @@
   1.818 + 	spur)
   1.819 + 		basic_machine=spur-unknown
   1.820 + 		;;
   1.821 +-	st2000)						# EGCS LOCAL
   1.822 ++	st2000)
   1.823 + 		basic_machine=m68k-tandem
   1.824 + 		;;
   1.825 +-	stratus)					# EGCS LOCAL
   1.826 ++	stratus)
   1.827 + 		basic_machine=i860-stratus
   1.828 + 		os=-sysv4
   1.829 + 		;;
   1.830 +@@ -756,16 +901,40 @@
   1.831 + 	sun386 | sun386i | roadrunner)
   1.832 + 		basic_machine=i386-sun
   1.833 + 		;;
   1.834 ++	sv1)
   1.835 ++		basic_machine=sv1-cray
   1.836 ++		os=-unicos
   1.837 ++		;;
   1.838 + 	symmetry)
   1.839 + 		basic_machine=i386-sequent
   1.840 + 		os=-dynix
   1.841 + 		;;
   1.842 ++	t3e)
   1.843 ++		basic_machine=alphaev5-cray
   1.844 ++		os=-unicos
   1.845 ++		;;
   1.846 ++	t90)
   1.847 ++		basic_machine=t90-cray
   1.848 ++		os=-unicos
   1.849 ++		;;
   1.850 ++        tic4x | c4x*)
   1.851 ++		basic_machine=tic4x-unknown
   1.852 ++		os=-coff
   1.853 ++		;;
   1.854 ++	tic54x | c54x*)
   1.855 ++		basic_machine=tic54x-unknown
   1.856 ++		os=-coff
   1.857 ++		;;
   1.858 + 	tx39)
   1.859 + 		basic_machine=mipstx39-unknown
   1.860 + 		;;
   1.861 + 	tx39el)
   1.862 + 		basic_machine=mipstx39el-unknown
   1.863 + 		;;
   1.864 ++	toad1)
   1.865 ++		basic_machine=pdp10-xkl
   1.866 ++		os=-tops20
   1.867 ++		;;
   1.868 + 	tower | tower-32)
   1.869 + 		basic_machine=m68k-ncr
   1.870 + 		;;
   1.871 +@@ -777,7 +946,7 @@
   1.872 + 		basic_machine=a29k-nyu
   1.873 + 		os=-sym1
   1.874 + 		;;
   1.875 +-	v810 | necv810)					# EGCS LOCAL
   1.876 ++	v810 | necv810)
   1.877 + 		basic_machine=v810-nec
   1.878 + 		os=-none
   1.879 + 		;;
   1.880 +@@ -790,8 +959,8 @@
   1.881 + 		os=-vms
   1.882 + 		;;
   1.883 + 	vpp*|vx|vx-*)
   1.884 +-               basic_machine=f301-fujitsu
   1.885 +-               ;;
   1.886 ++		basic_machine=f301-fujitsu
   1.887 ++		;;
   1.888 + 	vxworks960)
   1.889 + 		basic_machine=i960-wrs
   1.890 + 		os=-vxworks
   1.891 +@@ -804,18 +973,22 @@
   1.892 + 		basic_machine=a29k-wrs
   1.893 + 		os=-vxworks
   1.894 + 		;;
   1.895 +-	w65*)						# EGCS LOCAL
   1.896 +- 		basic_machine=w65-wdc
   1.897 +- 		os=-none
   1.898 ++	w65*)
   1.899 ++		basic_machine=w65-wdc
   1.900 ++		os=-none
   1.901 + 		;;
   1.902 +-	xmp)
   1.903 +-		basic_machine=xmp-cray
   1.904 +-		os=-unicos
   1.905 ++	w89k-*)
   1.906 ++		basic_machine=hppa1.1-winbond
   1.907 ++		os=-proelf
   1.908 + 		;;
   1.909 +-        xps | xps100)
   1.910 ++	xps | xps100)
   1.911 + 		basic_machine=xps100-honeywell
   1.912 + 		;;
   1.913 +-	z8k-*-coff)					# EGCS LOCAL
   1.914 ++	ymp)
   1.915 ++		basic_machine=ymp-cray
   1.916 ++		os=-unicos
   1.917 ++		;;
   1.918 ++	z8k-*-coff)
   1.919 + 		basic_machine=z8k-unknown
   1.920 + 		os=-sim
   1.921 + 		;;
   1.922 +@@ -826,22 +999,15 @@
   1.923 + 
   1.924 + # Here we handle the default manufacturer of certain CPU types.  It is in
   1.925 + # some cases the only manufacturer, in others, it is the most popular.
   1.926 +-	w89k)						# EGCS LOCAL
   1.927 ++	w89k)
   1.928 + 		basic_machine=hppa1.1-winbond
   1.929 + 		;;
   1.930 +-	op50n)						# EGCS LOCAL
   1.931 ++	op50n)
   1.932 + 		basic_machine=hppa1.1-oki
   1.933 + 		;;
   1.934 +-	op60c)						# EGCS LOCAL
   1.935 ++	op60c)
   1.936 + 		basic_machine=hppa1.1-oki
   1.937 + 		;;
   1.938 +-	mips)
   1.939 +-		if [ x$os = x-linux-gnu ]; then
   1.940 +-			basic_machine=mips-unknown
   1.941 +-		else
   1.942 +-			basic_machine=mips-mips
   1.943 +-		fi
   1.944 +-		;;
   1.945 + 	romp)
   1.946 + 		basic_machine=romp-ibm
   1.947 + 		;;
   1.948 +@@ -851,16 +1017,26 @@
   1.949 + 	vax)
   1.950 + 		basic_machine=vax-dec
   1.951 + 		;;
   1.952 ++	pdp10)
   1.953 ++		# there are many clones, so DEC is not a safe bet
   1.954 ++		basic_machine=pdp10-unknown
   1.955 ++		;;
   1.956 + 	pdp11)
   1.957 + 		basic_machine=pdp11-dec
   1.958 + 		;;
   1.959 + 	we32k)
   1.960 + 		basic_machine=we32k-att
   1.961 + 		;;
   1.962 +-	sparc | sparcv9)
   1.963 ++	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
   1.964 ++		basic_machine=sh-unknown
   1.965 ++		;;
   1.966 ++	sh64)
   1.967 ++		basic_machine=sh64-unknown
   1.968 ++		;;
   1.969 ++	sparc | sparcv9 | sparcv9b)
   1.970 + 		basic_machine=sparc-sun
   1.971 + 		;;
   1.972 +-        cydra)
   1.973 ++	cydra)
   1.974 + 		basic_machine=cydra-cydrome
   1.975 + 		;;
   1.976 + 	orion)
   1.977 +@@ -869,16 +1045,15 @@
   1.978 + 	orion105)
   1.979 + 		basic_machine=clipper-highlevel
   1.980 + 		;;
   1.981 +-	mac | mpw | mac-mpw)				# EGCS LOCAL
   1.982 ++	mac | mpw | mac-mpw)
   1.983 + 		basic_machine=m68k-apple
   1.984 + 		;;
   1.985 +-	pmac | pmac-mpw)				# EGCS LOCAL
   1.986 ++	pmac | pmac-mpw)
   1.987 + 		basic_machine=powerpc-apple
   1.988 + 		;;
   1.989 +- 	c4x*)
   1.990 +- 		basic_machine=c4x-none
   1.991 +- 		os=-coff
   1.992 +-  		;;
   1.993 ++	*-unknown)
   1.994 ++		# Make sure to match an already-canonicalized machine name.
   1.995 ++		;;
   1.996 + 	*)
   1.997 + 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
   1.998 + 		exit 1
   1.999 +@@ -935,20 +1110,38 @@
  1.1000 + 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  1.1001 + 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  1.1002 + 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  1.1003 ++	      | -chorusos* | -chorusrdb* \
  1.1004 + 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  1.1005 + 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
  1.1006 +-	      | -interix* | -uwin* )
  1.1007 ++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  1.1008 ++	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  1.1009 ++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  1.1010 ++	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  1.1011 ++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  1.1012 ++	      | -powermax* | -dnix* | -microbsd*)
  1.1013 + 	# Remember, each alternative MUST END IN *, to match a version number.
  1.1014 + 		;;
  1.1015 +-	# EGCS LOCAL
  1.1016 ++	-qnx*)
  1.1017 ++		case $basic_machine in
  1.1018 ++		    x86-* | i*86-*)
  1.1019 ++			;;
  1.1020 ++		    *)
  1.1021 ++			os=-nto$os
  1.1022 ++			;;
  1.1023 ++		esac
  1.1024 ++		;;
  1.1025 ++	-nto-qnx*)
  1.1026 ++		;;
  1.1027 ++	-nto*)
  1.1028 ++		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  1.1029 ++		;;
  1.1030 + 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
  1.1031 +-	      | -windows* | -osx | -abug |  -netware* | -os9* | -beos* \
  1.1032 +-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews* )
  1.1033 ++	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
  1.1034 ++	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  1.1035 + 		;;
  1.1036 + 	-mac*)
  1.1037 + 		os=`echo $os | sed -e 's|mac|macos|'`
  1.1038 + 		;;
  1.1039 +-	# END EGCS LOCAL
  1.1040 + 	-linux*)
  1.1041 + 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
  1.1042 + 		;;
  1.1043 +@@ -958,6 +1151,12 @@
  1.1044 + 	-sunos6*)
  1.1045 + 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
  1.1046 + 		;;
  1.1047 ++	-opened*)
  1.1048 ++		os=-openedition
  1.1049 ++		;;
  1.1050 ++	-wince*)
  1.1051 ++		os=-wince
  1.1052 ++		;;
  1.1053 + 	-osfrose*)
  1.1054 + 		os=-osfrose
  1.1055 + 		;;
  1.1056 +@@ -973,14 +1172,23 @@
  1.1057 + 	-acis*)
  1.1058 + 		os=-aos
  1.1059 + 		;;
  1.1060 +-	-386bsd)					# EGCS LOCAL
  1.1061 ++	-atheos*)
  1.1062 ++		os=-atheos
  1.1063 ++		;;
  1.1064 ++	-386bsd)
  1.1065 + 		os=-bsd
  1.1066 + 		;;
  1.1067 + 	-ctix* | -uts*)
  1.1068 + 		os=-sysv
  1.1069 + 		;;
  1.1070 ++	-nova*)
  1.1071 ++		os=-rtmk-nova
  1.1072 ++		;;
  1.1073 + 	-ns2 )
  1.1074 +-	        os=-nextstep2
  1.1075 ++		os=-nextstep2
  1.1076 ++		;;
  1.1077 ++	-nsk*)
  1.1078 ++		os=-nsk
  1.1079 + 		;;
  1.1080 + 	# Preserve the version number of sinix5.
  1.1081 + 	-sinix5.*)
  1.1082 +@@ -1007,15 +1215,21 @@
  1.1083 + 	# This must come after -sysvr4.
  1.1084 + 	-sysv*)
  1.1085 + 		;;
  1.1086 +-	-ose*)						# EGCS LOCAL
  1.1087 ++	-ose*)
  1.1088 + 		os=-ose
  1.1089 + 		;;
  1.1090 +-	-es1800*)					# EGCS LOCAL
  1.1091 ++	-es1800*)
  1.1092 + 		os=-ose
  1.1093 + 		;;
  1.1094 + 	-xenix)
  1.1095 + 		os=-xenix
  1.1096 + 		;;
  1.1097 ++	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  1.1098 ++		os=-mint
  1.1099 ++		;;
  1.1100 ++	-aros*)
  1.1101 ++		os=-aros
  1.1102 ++		;;
  1.1103 + 	-none)
  1.1104 + 		;;
  1.1105 + 	*)
  1.1106 +@@ -1041,13 +1255,17 @@
  1.1107 + 	*-acorn)
  1.1108 + 		os=-riscix1.2
  1.1109 + 		;;
  1.1110 +-	arm*-corel)
  1.1111 ++	arm*-rebel)
  1.1112 + 		os=-linux
  1.1113 + 		;;
  1.1114 + 	arm*-semi)
  1.1115 + 		os=-aout
  1.1116 + 		;;
  1.1117 +-        pdp11-*)
  1.1118 ++	# This must come before the *-dec entry.
  1.1119 ++	pdp10-*)
  1.1120 ++		os=-tops20
  1.1121 ++		;;
  1.1122 ++	pdp11-*)
  1.1123 + 		os=-none
  1.1124 + 		;;
  1.1125 + 	*-dec | vax-*)
  1.1126 +@@ -1065,15 +1283,18 @@
  1.1127 + 		# default.
  1.1128 + 		# os=-sunos4
  1.1129 + 		;;
  1.1130 +-	m68*-cisco)					# EGCS LOCAL
  1.1131 ++	m68*-cisco)
  1.1132 + 		os=-aout
  1.1133 + 		;;
  1.1134 +-	mips*-cisco)					# EGCS LOCAL
  1.1135 ++	mips*-cisco)
  1.1136 + 		os=-elf
  1.1137 + 		;;
  1.1138 +-        mips*-*)                                        # EGCS LOCAL
  1.1139 +-                os=-elf
  1.1140 +-                ;;
  1.1141 ++	mips*-*)
  1.1142 ++		os=-elf
  1.1143 ++		;;
  1.1144 ++	or32-*)
  1.1145 ++		os=-coff
  1.1146 ++		;;
  1.1147 + 	*-tti)	# must be before sparc entry or we get the wrong os.
  1.1148 + 		os=-sysv3
  1.1149 + 		;;
  1.1150 +@@ -1086,13 +1307,13 @@
  1.1151 + 	*-ibm)
  1.1152 + 		os=-aix
  1.1153 + 		;;
  1.1154 +-	*-wec)						# EGCS LOCAL
  1.1155 ++	*-wec)
  1.1156 + 		os=-proelf
  1.1157 + 		;;
  1.1158 +-	*-winbond)					# EGCS LOCAL
  1.1159 ++	*-winbond)
  1.1160 + 		os=-proelf
  1.1161 + 		;;
  1.1162 +-	*-oki)						# EGCS LOCAL
  1.1163 ++	*-oki)
  1.1164 + 		os=-proelf
  1.1165 + 		;;
  1.1166 + 	*-hp)
  1.1167 +@@ -1137,36 +1358,39 @@
  1.1168 + 	*-next)
  1.1169 + 		os=-nextstep3
  1.1170 + 		;;
  1.1171 +-        *-gould)
  1.1172 ++	*-gould)
  1.1173 + 		os=-sysv
  1.1174 + 		;;
  1.1175 +-        *-highlevel)
  1.1176 ++	*-highlevel)
  1.1177 + 		os=-bsd
  1.1178 + 		;;
  1.1179 + 	*-encore)
  1.1180 + 		os=-bsd
  1.1181 + 		;;
  1.1182 +-        *-sgi)
  1.1183 ++	*-sgi)
  1.1184 + 		os=-irix
  1.1185 + 		;;
  1.1186 +-        *-siemens)
  1.1187 ++	*-siemens)
  1.1188 + 		os=-sysv4
  1.1189 + 		;;
  1.1190 + 	*-masscomp)
  1.1191 + 		os=-rtu
  1.1192 + 		;;
  1.1193 +-	f301-fujitsu)
  1.1194 ++	f30[01]-fujitsu | f700-fujitsu)
  1.1195 + 		os=-uxpv
  1.1196 + 		;;
  1.1197 +-	*-rom68k)					# EGCS LOCAL
  1.1198 ++	*-rom68k)
  1.1199 + 		os=-coff
  1.1200 + 		;;
  1.1201 +-	*-*bug)						# EGCS LOCAL
  1.1202 ++	*-*bug)
  1.1203 + 		os=-coff
  1.1204 + 		;;
  1.1205 +-	*-apple)					# EGCS LOCAL
  1.1206 ++	*-apple)
  1.1207 + 		os=-macos
  1.1208 + 		;;
  1.1209 ++	*-atari*)
  1.1210 ++		os=-mint
  1.1211 ++		;;
  1.1212 + 	*)
  1.1213 + 		os=-none
  1.1214 + 		;;
  1.1215 +@@ -1212,27 +1436,41 @@
  1.1216 + 			-genix*)
  1.1217 + 				vendor=ns
  1.1218 + 				;;
  1.1219 +-			-mvs*)
  1.1220 ++			-mvs* | -opened*)
  1.1221 + 				vendor=ibm
  1.1222 + 				;;
  1.1223 + 			-ptx*)
  1.1224 + 				vendor=sequent
  1.1225 + 				;;
  1.1226 +-			-vxsim* | -vxworks*)
  1.1227 ++			-vxsim* | -vxworks* | -windiss*)
  1.1228 + 				vendor=wrs
  1.1229 + 				;;
  1.1230 + 			-aux*)
  1.1231 + 				vendor=apple
  1.1232 + 				;;
  1.1233 +-			-hms*)				# EGCS LOCAL
  1.1234 ++			-hms*)
  1.1235 + 				vendor=hitachi
  1.1236 + 				;;
  1.1237 +-			-mpw* | -macos*)		# EGCS LOCAL
  1.1238 ++			-mpw* | -macos*)
  1.1239 + 				vendor=apple
  1.1240 + 				;;
  1.1241 ++			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  1.1242 ++				vendor=atari
  1.1243 ++				;;
  1.1244 ++			-vos*)
  1.1245 ++				vendor=stratus
  1.1246 ++				;;
  1.1247 + 		esac
  1.1248 + 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
  1.1249 + 		;;
  1.1250 + esac
  1.1251 + 
  1.1252 + echo $basic_machine$os
  1.1253 ++exit 0
  1.1254 ++
  1.1255 ++# Local variables:
  1.1256 ++# eval: (add-hook 'write-file-hooks 'time-stamp)
  1.1257 ++# time-stamp-start: "timestamp='"
  1.1258 ++# time-stamp-format: "%:y-%02m-%02d"
  1.1259 ++# time-stamp-end: "'"
  1.1260 ++# End: