diff -r 1fd08b889aa3 -r e0ef539e23d9 patches/gcc/2.95.3/130-config.sub.patch
--- a/patches/gcc/2.95.3/130-config.sub.patch	Wed Oct 21 18:08:31 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1257 +0,0 @@
-# Backport from gcc-3.3.3
-# Fixes errors like
-#   Invalid configuration `x86_64-host_unknown-linux-gnu': machine `x86_64-host_unknown' not recognized
-#   Unrecognized host system name x86_64-host_unknown-linux-gnu.
-# when configuring on chip types or operating systems like x86_64 or Darwin
-# which are newer than gcc-2.95
-
---- gcc-2.95.3/config.sub.old	1999-08-04 01:09:26.000000000 -0700
-+++ gcc-2.95.3/config.sub	2004-03-24 11:28:24.000000000 -0800
-@@ -1,6 +1,10 @@
- #! /bin/sh
--# Configuration validation subroutine script, version 1.1.
--#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
-+# Configuration validation subroutine script.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+
-+timestamp='2003-01-28'
-+
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
- # can handle that machine.  It does not imply ALL GNU software can.
-@@ -25,6 +29,9 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
-@@ -45,30 +52,73 @@
- #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
- # It is wrong to echo any other type of specification.
- 
--if [ x$1 = x ]
--then
--	echo Configuration name missing. 1>&2
--	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
--	echo "or     $0 ALIAS" 1>&2
--	echo where ALIAS is a recognized configuration type. 1>&2
--	exit 1
--fi
-+me=`echo "$0" | sed -e 's,.*/,,'`
- 
--# First pass through any local machine types.
--case $1 in
--	*local*)
--		echo $1
--		exit 0
--		;;
--	*)
--	;;
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+       $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit 0 ;;
-+    --version | -v )
-+       echo "$version" ; exit 0 ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit 0 ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help"
-+       exit 1 ;;
-+
-+    *local*)
-+       # First pass through any local machine types.
-+       echo $1
-+       exit 0;;
-+
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+    exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+    exit 1;;
- esac
- 
- # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  linux-gnu*)
-+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-@@ -94,20 +144,28 @@
- 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple)
-+	-apple | -axis)
- 		os=
- 		basic_machine=$1
- 		;;
--	-sim | -cisco | -oki | -wec | -winbond )	# EGCS LOCAL
-+	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
- 		basic_machine=$1
- 		;;
--	-scout)						# EGCS LOCAL
-+	-scout)
- 		;;
--	-wrs)						# EGCS LOCAL
-+	-wrs)
- 		os=-vxworks
- 		basic_machine=$1
- 		;;
-+	-chorusos*)
-+		os=-chorusos
-+		basic_machine=$1
-+		;;
-+ 	-chorusrdb)
-+ 		os=-chorusrdb
-+		basic_machine=$1
-+ 		;;
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
-@@ -156,49 +214,72 @@
- 	-psos*)
- 		os=-psos
- 		;;
-+	-mint | -mint[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
- esac
- 
- # Decode aliases for certain CPU-COMPANY combinations.
- case $basic_machine in
- 	# Recognize the basic CPU types without company name.
- 	# Some are omitted here because they have special meanings below.
--	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
--		| arme[lb] | pyramid | mn10200 | mn10300 \
--		| tron | a29k | 580 | i960 | h8300 \
--		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
--		| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
--		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
--		| 1750a | dsp16xx | pdp11 \
--		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
--		| mipstx39 | mipstx39el \
--		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x)
--		basic_machine=$basic_machine-unknown
--		;;
--	m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
--	        | h8500 | w65) # EGCS LOCAL
--		;;
--	thumb)
--		basic_machine=$basic_machine-unknown
--		;;
--	mips64vr4300 | mips64vr4300el) # EGCS LOCAL jsmith/vr4300
-+	1750a | 580 \
-+	| a29k \
-+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+	| clipper \
-+	| d10v | d30v | dlx | dsp16xx \
-+	| fr30 | frv \
-+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| i370 | i860 | i960 | ia64 \
-+	| ip2k \
-+	| m32r | m68000 | m68k | m88k | mcore \
-+	| mips | mipsbe | mipseb | mipsel | mipsle \
-+	| mips16 \
-+	| mips64 | mips64el \
-+	| mips64vr | mips64vrel \
-+	| mips64orion | mips64orionel \
-+	| mips64vr4100 | mips64vr4100el \
-+	| mips64vr4300 | mips64vr4300el \
-+	| mips64vr5000 | mips64vr5000el \
-+	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa64 | mipsisa64el \
-+	| mipsisa64sb1 | mipsisa64sb1el \
-+	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipstx39 | mipstx39el \
-+	| mn10200 | mn10300 \
-+	| msp430 \
-+	| ns16k | ns32k \
-+	| openrisc | or32 \
-+	| pdp10 | pdp11 | pj | pjl \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| pyramid \
-+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh64 | sh64le \
-+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-+	| strongarm \
-+	| tahoe | thumb | tic80 | tron \
-+	| v850 | v850e \
-+	| we32k \
-+	| x86 | xscale | xstormy16 | xtensa \
-+	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
--	mips64vr4100 | mips64vr4100el) # EGCS LOCAL jsmith/vr4100
--		basic_machine=$basic_machine-unknown
--		;;
--	mips64vr5000 | mips64vr5000el) # EGCS LOCAL ian/vr5000
--		basic_machine=$basic_machine-unknown
--		;;
--	mips16)
-+	m6811 | m68hc11 | m6812 | m68hc12)
-+		# Motorola 68HC11/12.
- 		basic_machine=$basic_machine-unknown
-+		os=-none
- 		;;
--	d10v)
--		basic_machine=$basic_machine-unknown
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- 		;;
-+
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
- 	# (2) the word "unknown" tends to confuse beginning users.
--	i[34567]86)
-+	i*86 | x86_64)
- 	  basic_machine=$basic_machine-pc
- 	  ;;
- 	# Object if more than one company name word.
-@@ -207,44 +288,62 @@
- 		exit 1
- 		;;
- 	# Recognize the basic CPU types with company name.
--	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
--	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
--	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
--	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
--	      | xmp-* | ymp-* \
--	      | hppa-* | hppa1.0-* | hppa1.1-* \
--	      | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
--	      | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* \
--	      | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
--	      | xps100-* | clipper-* | orion-* \
--	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
--	      | sparc64-* | sparcv9-* | sparc86x-* | mips64-* | mipsel-* \
--	      | mips64el-* | mips64orion-* | mips64orionel-*  \
--	      | mipstx39-* | mipstx39el-* \
--	      | f301-* | arm*-*)
--		;;
--	m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-* | d10v-*) # EGCS LOCAL
--		;;
--	thumb-*) # EGCS LOCAL angela/thumb
--		;;
--	v850-*) # EGCS LOCAL
--	        ;;
--	d30v-*) # EGCS LOCAL
--	        ;;
--	mips64vr4300-* | mips64vr4300el-*) # EGCS LOCAL jsmith/vr4300
--		;;
--	mips64vr4100-* | mips64vr4100el-*) # EGCS LOCAL jsmith/vr4100
--		;;
--	mips16-*) # EGCS LOCAL krk/mips16
--		;;
--	tic30-*) # EGCS LOCAL ian/tic30
--		;;
--	c30-*) # EGCS LOCAL ian/tic30
--		basic_machine=tic30-unknown
-+	580-* \
-+	| a29k-* \
-+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| avr-* \
-+	| bs2000-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
-+	| clipper-* | cydra-* \
-+	| d10v-* | d30v-* | dlx-* \
-+	| elxsi-* \
-+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+	| h8300-* | h8500-* \
-+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| i*86-* | i860-* | i960-* | ia64-* \
-+	| ip2k-* \
-+	| m32r-* \
-+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+	| m88110-* | m88k-* | mcore-* \
-+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+	| mips16-* \
-+	| mips64-* | mips64el-* \
-+	| mips64vr-* | mips64vrel-* \
-+	| mips64orion-* | mips64orionel-* \
-+	| mips64vr4100-* | mips64vr4100el-* \
-+	| mips64vr4300-* | mips64vr4300el-* \
-+	| mips64vr5000-* | mips64vr5000el-* \
-+	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64sb1-* | mipsisa64sb1el-* \
-+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+	| mipstx39-* | mipstx39el-* \
-+	| msp430-* \
-+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-+	| orion-* \
-+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| pyramid-* \
-+	| romp-* | rs6000-* \
-+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-+	| v850-* | v850e-* | vax-* \
-+	| we32k-* \
-+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-+	| xtensa-* \
-+	| ymp-* \
-+	| z8k-*)
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
--	386bsd)						# EGCS LOCAL
-+	386bsd)
- 		basic_machine=i386-unknown
- 		os=-bsd
- 		;;
-@@ -254,11 +353,11 @@
- 	3b*)
- 		basic_machine=we32k-att
- 		;;
--	a29khif)					# EGCS LOCAL
-+	a29khif)
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
--	adobe68k)					# EGCS LOCAL
-+	adobe68k)
- 		basic_machine=m68010-adobe
- 		os=-scout
- 		;;
-@@ -277,21 +376,21 @@
- 		os=-sysv
- 		;;
- 	amiga | amiga-*)
--		basic_machine=m68k-cbm
-+		basic_machine=m68k-unknown
- 		;;
- 	amigaos | amigados)
--		basic_machine=m68k-cbm
-+		basic_machine=m68k-unknown
- 		os=-amigaos
- 		;;
- 	amigaunix | amix)
--		basic_machine=m68k-cbm
-+		basic_machine=m68k-unknown
- 		os=-sysv4
- 		;;
- 	apollo68)
- 		basic_machine=m68k-apollo
- 		os=-sysv
- 		;;
--	apollo68bsd)					# EGCS LOCAL
-+	apollo68bsd)
- 		basic_machine=m68k-apollo
- 		os=-bsd
- 		;;
-@@ -303,6 +402,10 @@
- 		basic_machine=ns32k-sequent
- 		os=-dynix
- 		;;
-+	c90)
-+		basic_machine=c90-cray
-+		os=-unicos
-+		;;
- 	convex-c1)
- 		basic_machine=c1-convex
- 		os=-bsd
-@@ -323,27 +426,30 @@
- 		basic_machine=c38-convex
- 		os=-bsd
- 		;;
--	cray | ymp)
--		basic_machine=ymp-cray
--		os=-unicos
--		;;
--	cray2)
--		basic_machine=cray2-cray
--		os=-unicos
--		;;
--	[ctj]90-cray)
--		basic_machine=c90-cray
-+	cray | j90)
-+		basic_machine=j90-cray
- 		os=-unicos
- 		;;
- 	crds | unos)
- 		basic_machine=m68k-crds
- 		;;
-+	cris | cris-* | etrax*)
-+		basic_machine=cris-axis
-+		;;
- 	da30 | da30-*)
- 		basic_machine=m68k-da30
- 		;;
- 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- 		basic_machine=mips-dec
- 		;;
-+	decsystem10* | dec10*)
-+		basic_machine=pdp10-dec
-+		os=-tops10
-+		;;
-+	decsystem20* | dec20*)
-+		basic_machine=pdp10-dec
-+		os=-tops20
-+		;;
- 	delta | 3300 | motorola-3300 | motorola-delta \
- 	      | 3300-motorola | delta-motorola)
- 		basic_machine=m68k-motorola
-@@ -371,7 +477,7 @@
- 	encore | umax | mmax)
- 		basic_machine=ns32k-encore
- 		;;
--	es1800 | OSE68k | ose68k | ose | OSE)		# EGCS LOCAL
-+	es1800 | OSE68k | ose68k | ose | OSE)
- 		basic_machine=m68k-ericsson
- 		os=-ose
- 		;;
-@@ -385,6 +491,10 @@
- 		basic_machine=tron-gmicro
- 		os=-sysv
- 		;;
-+	go32)
-+		basic_machine=i386-pc
-+		os=-go32
-+		;;
- 	h3050r* | hiux*)
- 		basic_machine=hppa1.1-hitachi
- 		os=-hiuxwe2
-@@ -393,11 +503,11 @@
- 		basic_machine=h8300-hitachi
- 		os=-hms
- 		;;
--	h8300xray)					# EGCS LOCAL
-+	h8300xray)
- 		basic_machine=h8300-hitachi
- 		os=-xray
- 		;;
--	h8500hms)					# EGCS LOCAL
-+	h8500hms)
- 		basic_machine=h8500-hitachi
- 		os=-hms
- 		;;
-@@ -416,22 +526,6 @@
- 		basic_machine=m68k-hp
- 		os=-hpux
- 		;;
--        w89k-*)						# EGCS LOCAL
--                basic_machine=hppa1.1-winbond
--                os=-proelf
--                ;;
--        op50n-*)					# EGCS LOCAL
--                basic_machine=hppa1.1-oki
--                os=-proelf
--                ;;
--        op60c-*)					# EGCS LOCAL
--                basic_machine=hppa1.1-oki
--                os=-proelf
--                ;;
--        hppro)						# EGCS LOCAL
--                basic_machine=hppa1.1-hp
--                os=-proelf
--                ;;
- 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
- 		basic_machine=hppa1.0-hp
- 		;;
-@@ -441,22 +535,21 @@
- 	hp9k3[2-9][0-9])
- 		basic_machine=m68k-hp
- 		;;
--	hp9k6[0-9][0-9] | hp6[0-9][0-9] )
-+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
- 		basic_machine=hppa1.0-hp
- 		;;
--	hp9k7[0-79][0-9] | hp7[0-79][0-9] )
-+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
- 		basic_machine=hppa1.1-hp
- 		;;
--	hp9k78[0-9] | hp78[0-9] )
-+	hp9k78[0-9] | hp78[0-9])
- 		# FIXME: really hppa2.0-hp
- 		basic_machine=hppa1.1-hp
- 		;;
--	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | \
--	hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893 )
-+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
- 		# FIXME: really hppa2.0-hp
- 		basic_machine=hppa1.1-hp
- 		;;
--	hp9k8[0-9][13679] | hp8[0-9][13679] )
-+	hp9k8[0-9][13679] | hp8[0-9][13679])
- 		basic_machine=hppa1.1-hp
- 		;;
- 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-@@ -465,47 +558,42 @@
- 	hppa-next)
- 		os=-nextstep3
- 		;;
--	hppaosf)					# EGCS LOCAL
-+	hppaosf)
- 		basic_machine=hppa1.1-hp
- 		os=-osf
- 		;;
-+	hppro)
-+		basic_machine=hppa1.1-hp
-+		os=-proelf
-+		;;
- 	i370-ibm* | ibm*)
- 		basic_machine=i370-ibm
--		os=-mvs
- 		;;
- # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
--	i[34567]86v32)
-+	i*86v32)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv32
- 		;;
--	i[34567]86v4*)
-+	i*86v4*)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv4
- 		;;
--	i[34567]86v)
-+	i*86v)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv
- 		;;
--	i[34567]86sol2)
-+	i*86sol2)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-solaris2
- 		;;
--	i386mach)					# EGCS LOCAL
-+	i386mach)
- 		basic_machine=i386-mach
- 		os=-mach
- 		;;
--	i386-vsta | vsta)				# EGCS LOCAL
-+	i386-vsta | vsta)
- 		basic_machine=i386-unknown
- 		os=-vsta
- 		;;
--	i386-go32 | go32)				# EGCS LOCAL
--		basic_machine=i386-unknown
--		os=-go32
--		;;
--	i386-mingw32 | mingw32)
--		basic_machine=i386-unknown
--		os=-mingw32
--		;;
- 	iris | iris4d)
- 		basic_machine=mips-sgi
- 		case $os in
-@@ -531,16 +619,16 @@
- 		basic_machine=ns32k-utek
- 		os=-sysv
- 		;;
-+	mingw32)
-+		basic_machine=i386-pc
-+		os=-mingw32
-+		;;
- 	miniframe)
- 		basic_machine=m68000-convergent
- 		;;
--	mipsel*-linux*)
--		basic_machine=mipsel-unknown
--		os=-linux-gnu
--		;;
--	mips*-linux*)
--		basic_machine=mips-unknown
--		os=-linux-gnu
-+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
- 		;;
- 	mips3*-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-@@ -548,24 +636,36 @@
- 	mips3*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- 		;;
--	monitor)					# EGCS LOCAL
-+	mmix*)
-+		basic_machine=mmix-knuth
-+		os=-mmixware
-+		;;
-+	monitor)
- 		basic_machine=m68k-rom68k
- 		os=-coff
- 		;;
--	msdos)						# EGCS LOCAL
--		basic_machine=i386-unknown	
-+	morphos)
-+		basic_machine=powerpc-unknown
-+		os=-morphos
-+		;;
-+	msdos)
-+		basic_machine=i386-pc
- 		os=-msdos
- 		;;
-+	mvs)
-+		basic_machine=i370-ibm
-+		os=-mvs
-+		;;
- 	ncr3000)
- 		basic_machine=i486-ncr
- 		os=-sysv4
- 		;;
- 	netbsd386)
--		basic_machine=i386-unknown		# EGCS LOCAL
-+		basic_machine=i386-unknown
- 		os=-netbsd
- 		;;
- 	netwinder)
--		basic_machine=armv4l-corel
-+		basic_machine=armv4l-rebel
- 		os=-linux
- 		;;
- 	news | news700 | news800 | news900)
-@@ -580,7 +680,7 @@
- 		basic_machine=mips-sony
- 		os=-newsos
- 		;;
--	necv70)						# EGCS LOCAL
-+	necv70)
- 		basic_machine=v70-nec
- 		os=-sysv
- 		;;
-@@ -609,18 +709,37 @@
- 		basic_machine=i960-intel
- 		os=-nindy
- 		;;
--	mon960)						# EGCS LOCAL
-+	mon960)
- 		basic_machine=i960-intel
- 		os=-mon960
- 		;;
-+	nonstopux)
-+		basic_machine=mips-compaq
-+		os=-nonstopux
-+		;;
- 	np1)
- 		basic_machine=np1-gould
- 		;;
--	OSE68000 | ose68000)				# EGCS LOCAL
-+	nv1)
-+		basic_machine=nv1-cray
-+		os=-unicosmp
-+		;;
-+	nsr-tandem)
-+		basic_machine=nsr-tandem
-+		;;
-+	op50n-* | op60c-*)
-+		basic_machine=hppa1.1-oki
-+		os=-proelf
-+		;;
-+	or32 | or32-*)
-+		basic_machine=or32-unknown
-+		os=-coff
-+		;;
-+	OSE68000 | ose68000)
- 		basic_machine=m68000-ericsson
- 		os=-ose
- 		;;
--	os68k)						# EGCS LOCAL
-+	os68k)
- 		basic_machine=m68k-none
- 		os=-os68k
- 		;;
-@@ -638,46 +757,60 @@
- 	pbb)
- 		basic_machine=m68k-tti
- 		;;
--        pc532 | pc532-*)
-+	pc532 | pc532-*)
- 		basic_machine=ns32k-pc532
- 		;;
--	pentium | p5 | k5 | k6 | nexen)
-+	pentium | p5 | k5 | k6 | nexgen | viac3)
- 		basic_machine=i586-pc
- 		;;
--	pentiumpro | p6 | 6x86)
-+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
- 		basic_machine=i686-pc
- 		;;
- 	pentiumii | pentium2)
--		basic_machine=i786-pc
-+		basic_machine=i686-pc
- 		;;
--	pentium-* | p5-* | k5-* | k6-* | nexen-*)
-+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
--	pentiumpro-* | p6-* | 6x86-*)
-+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	pentiumii-* | pentium2-*)
--		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	pn)
- 		basic_machine=pn-gould
- 		;;
--	power)	basic_machine=rs6000-ibm
-+	power)	basic_machine=power-ibm
- 		;;
- 	ppc)	basic_machine=powerpc-unknown
--	        ;;
-+		;;
- 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	ppcle | powerpclittle | ppc-le | powerpc-little)
- 		basic_machine=powerpcle-unknown
--	        ;;
-+		;;
- 	ppcle-* | powerpclittle-*)
- 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
-+	ppc64)	basic_machine=powerpc64-unknown
-+		;;
-+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+		basic_machine=powerpc64le-unknown
-+		;;
-+	ppc64le-* | powerpc64little-*)
-+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	ps2)
- 		basic_machine=i386-ibm
- 		;;
--	rom68k)						# EGCS LOCAL
-+	pw32)
-+		basic_machine=i586-unknown
-+		os=-pw32
-+		;;
-+	rom68k)
- 		basic_machine=m68k-rom68k
- 		os=-coff
- 		;;
-@@ -687,10 +820,22 @@
- 	rtpc | rtpc-*)
- 		basic_machine=romp-ibm
- 		;;
--	sa29200)					# EGCS LOCAL
-+	s390 | s390-*)
-+		basic_machine=s390-ibm
-+		;;
-+	s390x | s390x-*)
-+		basic_machine=s390x-ibm
-+		;;
-+	sa29200)
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
-+	sb1)
-+		basic_machine=mipsisa64sb1-unknown
-+		;;
-+	sb1el)
-+		basic_machine=mipsisa64sb1el-unknown
-+		;;
- 	sequent)
- 		basic_machine=i386-sequent
- 		;;
-@@ -698,7 +843,7 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
--	sparclite-wrs)					# EGCS LOCAL
-+	sparclite-wrs | simso-wrs)
- 		basic_machine=sparclite-wrs
- 		os=-vxworks
- 		;;
-@@ -709,10 +854,10 @@
- 	spur)
- 		basic_machine=spur-unknown
- 		;;
--	st2000)						# EGCS LOCAL
-+	st2000)
- 		basic_machine=m68k-tandem
- 		;;
--	stratus)					# EGCS LOCAL
-+	stratus)
- 		basic_machine=i860-stratus
- 		os=-sysv4
- 		;;
-@@ -756,16 +901,40 @@
- 	sun386 | sun386i | roadrunner)
- 		basic_machine=i386-sun
- 		;;
-+	sv1)
-+		basic_machine=sv1-cray
-+		os=-unicos
-+		;;
- 	symmetry)
- 		basic_machine=i386-sequent
- 		os=-dynix
- 		;;
-+	t3e)
-+		basic_machine=alphaev5-cray
-+		os=-unicos
-+		;;
-+	t90)
-+		basic_machine=t90-cray
-+		os=-unicos
-+		;;
-+        tic4x | c4x*)
-+		basic_machine=tic4x-unknown
-+		os=-coff
-+		;;
-+	tic54x | c54x*)
-+		basic_machine=tic54x-unknown
-+		os=-coff
-+		;;
- 	tx39)
- 		basic_machine=mipstx39-unknown
- 		;;
- 	tx39el)
- 		basic_machine=mipstx39el-unknown
- 		;;
-+	toad1)
-+		basic_machine=pdp10-xkl
-+		os=-tops20
-+		;;
- 	tower | tower-32)
- 		basic_machine=m68k-ncr
- 		;;
-@@ -777,7 +946,7 @@
- 		basic_machine=a29k-nyu
- 		os=-sym1
- 		;;
--	v810 | necv810)					# EGCS LOCAL
-+	v810 | necv810)
- 		basic_machine=v810-nec
- 		os=-none
- 		;;
-@@ -790,8 +959,8 @@
- 		os=-vms
- 		;;
- 	vpp*|vx|vx-*)
--               basic_machine=f301-fujitsu
--               ;;
-+		basic_machine=f301-fujitsu
-+		;;
- 	vxworks960)
- 		basic_machine=i960-wrs
- 		os=-vxworks
-@@ -804,18 +973,22 @@
- 		basic_machine=a29k-wrs
- 		os=-vxworks
- 		;;
--	w65*)						# EGCS LOCAL
-- 		basic_machine=w65-wdc
-- 		os=-none
-+	w65*)
-+		basic_machine=w65-wdc
-+		os=-none
- 		;;
--	xmp)
--		basic_machine=xmp-cray
--		os=-unicos
-+	w89k-*)
-+		basic_machine=hppa1.1-winbond
-+		os=-proelf
- 		;;
--        xps | xps100)
-+	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
--	z8k-*-coff)					# EGCS LOCAL
-+	ymp)
-+		basic_machine=ymp-cray
-+		os=-unicos
-+		;;
-+	z8k-*-coff)
- 		basic_machine=z8k-unknown
- 		os=-sim
- 		;;
-@@ -826,22 +999,15 @@
- 
- # Here we handle the default manufacturer of certain CPU types.  It is in
- # some cases the only manufacturer, in others, it is the most popular.
--	w89k)						# EGCS LOCAL
-+	w89k)
- 		basic_machine=hppa1.1-winbond
- 		;;
--	op50n)						# EGCS LOCAL
-+	op50n)
- 		basic_machine=hppa1.1-oki
- 		;;
--	op60c)						# EGCS LOCAL
-+	op60c)
- 		basic_machine=hppa1.1-oki
- 		;;
--	mips)
--		if [ x$os = x-linux-gnu ]; then
--			basic_machine=mips-unknown
--		else
--			basic_machine=mips-mips
--		fi
--		;;
- 	romp)
- 		basic_machine=romp-ibm
- 		;;
-@@ -851,16 +1017,26 @@
- 	vax)
- 		basic_machine=vax-dec
- 		;;
-+	pdp10)
-+		# there are many clones, so DEC is not a safe bet
-+		basic_machine=pdp10-unknown
-+		;;
- 	pdp11)
- 		basic_machine=pdp11-dec
- 		;;
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sparc | sparcv9)
-+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+		basic_machine=sh-unknown
-+		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparc | sparcv9 | sparcv9b)
- 		basic_machine=sparc-sun
- 		;;
--        cydra)
-+	cydra)
- 		basic_machine=cydra-cydrome
- 		;;
- 	orion)
-@@ -869,16 +1045,15 @@
- 	orion105)
- 		basic_machine=clipper-highlevel
- 		;;
--	mac | mpw | mac-mpw)				# EGCS LOCAL
-+	mac | mpw | mac-mpw)
- 		basic_machine=m68k-apple
- 		;;
--	pmac | pmac-mpw)				# EGCS LOCAL
-+	pmac | pmac-mpw)
- 		basic_machine=powerpc-apple
- 		;;
-- 	c4x*)
-- 		basic_machine=c4x-none
-- 		os=-coff
--  		;;
-+	*-unknown)
-+		# Make sure to match an already-canonicalized machine name.
-+		;;
- 	*)
- 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- 		exit 1
-@@ -935,20 +1110,38 @@
- 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
--	      | -interix* | -uwin* )
-+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+	      | -powermax* | -dnix* | -microbsd*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
--	# EGCS LOCAL
-+	-qnx*)
-+		case $basic_machine in
-+		    x86-* | i*86-*)
-+			;;
-+		    *)
-+			os=-nto$os
-+			;;
-+		esac
-+		;;
-+	-nto-qnx*)
-+		;;
-+	-nto*)
-+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+		;;
- 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--	      | -windows* | -osx | -abug |  -netware* | -os9* | -beos* \
--	      | -macos* | -mpw* | -magic* | -mon960* | -lnews* )
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- 		;;
- 	-mac*)
- 		os=`echo $os | sed -e 's|mac|macos|'`
- 		;;
--	# END EGCS LOCAL
- 	-linux*)
- 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
- 		;;
-@@ -958,6 +1151,12 @@
- 	-sunos6*)
- 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
- 		;;
-+	-opened*)
-+		os=-openedition
-+		;;
-+	-wince*)
-+		os=-wince
-+		;;
- 	-osfrose*)
- 		os=-osfrose
- 		;;
-@@ -973,14 +1172,23 @@
- 	-acis*)
- 		os=-aos
- 		;;
--	-386bsd)					# EGCS LOCAL
-+	-atheos*)
-+		os=-atheos
-+		;;
-+	-386bsd)
- 		os=-bsd
- 		;;
- 	-ctix* | -uts*)
- 		os=-sysv
- 		;;
-+	-nova*)
-+		os=-rtmk-nova
-+		;;
- 	-ns2 )
--	        os=-nextstep2
-+		os=-nextstep2
-+		;;
-+	-nsk*)
-+		os=-nsk
- 		;;
- 	# Preserve the version number of sinix5.
- 	-sinix5.*)
-@@ -1007,15 +1215,21 @@
- 	# This must come after -sysvr4.
- 	-sysv*)
- 		;;
--	-ose*)						# EGCS LOCAL
-+	-ose*)
- 		os=-ose
- 		;;
--	-es1800*)					# EGCS LOCAL
-+	-es1800*)
- 		os=-ose
- 		;;
- 	-xenix)
- 		os=-xenix
- 		;;
-+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+		os=-mint
-+		;;
-+	-aros*)
-+		os=-aros
-+		;;
- 	-none)
- 		;;
- 	*)
-@@ -1041,13 +1255,17 @@
- 	*-acorn)
- 		os=-riscix1.2
- 		;;
--	arm*-corel)
-+	arm*-rebel)
- 		os=-linux
- 		;;
- 	arm*-semi)
- 		os=-aout
- 		;;
--        pdp11-*)
-+	# This must come before the *-dec entry.
-+	pdp10-*)
-+		os=-tops20
-+		;;
-+	pdp11-*)
- 		os=-none
- 		;;
- 	*-dec | vax-*)
-@@ -1065,15 +1283,18 @@
- 		# default.
- 		# os=-sunos4
- 		;;
--	m68*-cisco)					# EGCS LOCAL
-+	m68*-cisco)
- 		os=-aout
- 		;;
--	mips*-cisco)					# EGCS LOCAL
-+	mips*-cisco)
- 		os=-elf
- 		;;
--        mips*-*)                                        # EGCS LOCAL
--                os=-elf
--                ;;
-+	mips*-*)
-+		os=-elf
-+		;;
-+	or32-*)
-+		os=-coff
-+		;;
- 	*-tti)	# must be before sparc entry or we get the wrong os.
- 		os=-sysv3
- 		;;
-@@ -1086,13 +1307,13 @@
- 	*-ibm)
- 		os=-aix
- 		;;
--	*-wec)						# EGCS LOCAL
-+	*-wec)
- 		os=-proelf
- 		;;
--	*-winbond)					# EGCS LOCAL
-+	*-winbond)
- 		os=-proelf
- 		;;
--	*-oki)						# EGCS LOCAL
-+	*-oki)
- 		os=-proelf
- 		;;
- 	*-hp)
-@@ -1137,36 +1358,39 @@
- 	*-next)
- 		os=-nextstep3
- 		;;
--        *-gould)
-+	*-gould)
- 		os=-sysv
- 		;;
--        *-highlevel)
-+	*-highlevel)
- 		os=-bsd
- 		;;
- 	*-encore)
- 		os=-bsd
- 		;;
--        *-sgi)
-+	*-sgi)
- 		os=-irix
- 		;;
--        *-siemens)
-+	*-siemens)
- 		os=-sysv4
- 		;;
- 	*-masscomp)
- 		os=-rtu
- 		;;
--	f301-fujitsu)
-+	f30[01]-fujitsu | f700-fujitsu)
- 		os=-uxpv
- 		;;
--	*-rom68k)					# EGCS LOCAL
-+	*-rom68k)
- 		os=-coff
- 		;;
--	*-*bug)						# EGCS LOCAL
-+	*-*bug)
- 		os=-coff
- 		;;
--	*-apple)					# EGCS LOCAL
-+	*-apple)
- 		os=-macos
- 		;;
-+	*-atari*)
-+		os=-mint
-+		;;
- 	*)
- 		os=-none
- 		;;
-@@ -1212,27 +1436,41 @@
- 			-genix*)
- 				vendor=ns
- 				;;
--			-mvs*)
-+			-mvs* | -opened*)
- 				vendor=ibm
- 				;;
- 			-ptx*)
- 				vendor=sequent
- 				;;
--			-vxsim* | -vxworks*)
-+			-vxsim* | -vxworks* | -windiss*)
- 				vendor=wrs
- 				;;
- 			-aux*)
- 				vendor=apple
- 				;;
--			-hms*)				# EGCS LOCAL
-+			-hms*)
- 				vendor=hitachi
- 				;;
--			-mpw* | -macos*)		# EGCS LOCAL
-+			-mpw* | -macos*)
- 				vendor=apple
- 				;;
-+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+				vendor=atari
-+				;;
-+			-vos*)
-+				vendor=stratus
-+				;;
- 		esac
- 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- 		;;
- esac
- 
- echo $basic_machine$os
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End: