# Backport glibc-2.3.2's config.sub to glibc-2.1.3 

 # Should fix nonfatal but annoying like

 #   checking build system type... Invalid configuration `x86_64-unknown-linux-gnu': machine `x86_64-unknown' not recognized

 #   ../glibc-2.1.3/configure: line 1227: test: i686-unknown-linux-gnu: unary operator expected

 #   checking build system type... Configuration name missing.

 --- glibc-2.1.3/scripts/config.sub	2004-03-24 13:27:06.000000000 -0800

 +++ glibc-2.3.2/scripts/config.sub	2002-07-10 00:24:32.000000000 -0700

 @@ -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 Free Software Foundation, Inc.

 +

 +timestamp='2002-07-03'

 +

  # 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* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)

      os=-$maybe_os

      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`

      ;;

 @@ -94,7 +144,7 @@

  	-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

  		;;

 @@ -108,6 +158,14 @@

  		os=-vxworks

  		basic_machine=$1

  		;;

 +	-chorusos*)

 +		os=-chorusos

 +		basic_machine=$1

 +		;;

 + 	-chorusrdb)

 + 		os=-chorusrdb

 +		basic_machine=$1

 + 		;;

  	-hiux*)

  		os=-hiuxwe2

  		;;

 @@ -166,27 +224,58 @@

  case $basic_machine in

  	# Recognize the basic CPU types without company name.

  	# Some are omitted here because they have special meanings below.

 -	tahoe | i860 | ia64 | 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 | alphaev[4-7] | alphaev56 | alphapca5[67] \

 -		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \

 -		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \

 -		| mips64orion | mips64orionel | mipstx39 | mipstx39el \

 -		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \

 -		| mips64vr5000 | miprs64vr5000el | mcore \

 -		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \

 -		| thumb | d10v | fr30)

 +	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 \

 +	| c4x | 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 \

 +	| mips64orion | mips64orionel \

 +	| mips64vr4100 | mips64vr4100el \

 +	| mips64vr4300 | mips64vr4300el \

 +	| mips64vr5000 | mips64vr5000el \

 +	| mipsisa32 | mipsisa32el \

 +	| mipsisa64 | mipsisa64el \

 +	| mipsisa64sb1 | mipsisa64sb1el \

 +	| mipstx39 | mipstx39el \

 +	| mn10200 | mn10300 \

 +	| ns16k | ns32k \

 +	| openrisc | or32 \

 +	| pdp10 | pdp11 | pj | pjl \

 +	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \

 +	| pyramid \

 +	| sh | sh[1234] | sh3e | 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

 +		;;

 +	m6811 | m68hc11 | m6812 | m68hc12)

 +		# Motorola 68HC11/12.

  		basic_machine=$basic_machine-unknown

 +		os=-none

  		;;

 -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)

 +	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.

 @@ -195,24 +284,54 @@

  		exit 1

  		;;

  	# Recognize the basic CPU types with company name.

 -	# FIXME: clean up the formatting here.

 -	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \

 -	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \

 -	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \

 -	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \

 -	      | xmp-* | ymp-* \

 -	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \

 -	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \

 -	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \

 -	      | clipper-* | orion-* \

 -	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \

 -	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \

 -	      | mips64el-* | mips64orion-* | mips64orionel-* \

 -	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \

 -	      | mipstx39-* | mipstx39el-* | mcore-* \

 -	      | f301-* | armv*-* | t3e-* \

 -	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \

 -	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )

 +	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-* | 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-* \

 +	| mips64orion-* | mips64orionel-* \

 +	| mips64vr4100-* | mips64vr4100el-* \

 +	| mips64vr4300-* | mips64vr4300el-* \

 +	| mips64vr5000-* | mips64vr5000el-* \

 +	| mipsisa32-* | mipsisa32el-* \

 +	| mipsisa64-* | mipsisa64el-* \

 +	| mipsisa64sb1-* | mipsisa64sb1el-* \

 +	| mipstx39 | mipstx39el \

 +	| none-* | np1-* | ns16k-* | ns32k-* \

 +	| orion-* \

 +	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \

 +	| pyramid-* \

 +	| romp-* | rs6000-* \

 +	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \

 +	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \

 +	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \

 +	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \

 +	| tahoe-* | thumb-* | tic30-* | 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.

 @@ -249,14 +368,14 @@

  		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)

 @@ -275,6 +394,10 @@

  		basic_machine=ns32k-sequent

  		os=-dynix

  		;;

 +	c90)

 +		basic_machine=c90-cray

 +		os=-unicos

 +		;;

  	convex-c1)

  		basic_machine=c1-convex

  		os=-bsd

 @@ -295,27 +418,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

 @@ -357,6 +483,10 @@

  		basic_machine=tron-gmicro

  		os=-sysv

  		;;

 +	go32)

 +		basic_machine=i386-pc

 +		os=-go32

 +		;;

  	h3050r* | hiux*)

  		basic_machine=hppa1.1-hitachi

  		os=-hiuxwe2

 @@ -432,19 +562,19 @@

  		basic_machine=i370-ibm

  		;;

  # 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

  		;;

 @@ -456,17 +586,6 @@

  		basic_machine=i386-unknown

  		os=-vsta

  		;;

 -	i386-go32 | go32)

 -		basic_machine=i386-unknown

 -		os=-go32

 -		;;

 -	i386-mingw32 | mingw32)

 -		basic_machine=i386-unknown

 -		os=-mingw32

 -		;;

 -	i386-qnx | qnx)

 -		basic_machine=i386-qnx

 -		;;

  	iris | iris4d)

  		basic_machine=mips-sgi

  		case $os in

 @@ -492,6 +611,10 @@

  		basic_machine=ns32k-utek

  		os=-sysv

  		;;

 +	mingw32)

 +		basic_machine=i386-pc

 +		os=-mingw32

 +		;;

  	miniframe)

  		basic_machine=m68000-convergent

  		;;

 @@ -499,26 +622,26 @@

  		basic_machine=m68k-atari

  		os=-mint

  		;;

 -	mipsel*-linux*)

 -		basic_machine=mipsel-unknown

 -		os=-linux-gnu

 -		;;

 -	mips*-linux*)

 -		basic_machine=mips-unknown

 -		os=-linux-gnu

 -		;;

  	mips3*-*)

  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`

  		;;

  	mips3*)

  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown

  		;;

 +	mmix*)

 +		basic_machine=mmix-knuth

 +		os=-mmixware

 +		;;

  	monitor)

  		basic_machine=m68k-rom68k

  		os=-coff

  		;;

 +	morphos)

 +		basic_machine=powerpc-unknown

 +		os=-morphos

 +		;;

  	msdos)

 -		basic_machine=i386-unknown

 +		basic_machine=i386-pc

  		os=-msdos

  		;;

  	mvs)

 @@ -582,13 +705,24 @@

  		basic_machine=i960-intel

  		os=-mon960

  		;;

 +	nonstopux)

 +		basic_machine=mips-compaq

 +		os=-nonstopux

 +		;;

  	np1)

  		basic_machine=np1-gould

  		;;

 +	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

 @@ -614,28 +748,28 @@

          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)

  		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

  	        ;;

 @@ -647,9 +781,23 @@

  	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

  		;;

 +	pw32)

 +		basic_machine=i586-unknown

 +		os=-pw32

 +		;;

  	rom68k)

  		basic_machine=m68k-rom68k

  		os=-coff

 @@ -660,6 +808,12 @@

  	rtpc | rtpc-*)

  		basic_machine=romp-ibm

  		;;

 +	s390 | s390-*)

 +		basic_machine=s390-ibm

 +		;;

 +	s390x | s390x-*)

 +		basic_machine=s390x-ibm

 +		;;

  	sa29200)

  		basic_machine=a29k-amd

  		os=-udi

 @@ -671,7 +825,7 @@

  		basic_machine=sh-hitachi

  		os=-hms

  		;;

 -	sparclite-wrs)

 +	sparclite-wrs | simso-wrs)

  		basic_machine=sparclite-wrs

  		os=-vxworks

  		;;

 @@ -729,20 +883,40 @@

  	sun386 | sun386i | roadrunner)

  		basic_machine=i386-sun

  		;;

 +        sv1)

 +		basic_machine=sv1-cray

 +		os=-unicos

 +		;;

  	symmetry)

  		basic_machine=i386-sequent

  		os=-dynix

  		;;

 +	t3d)

 +		basic_machine=alpha-cray

 +		os=-unicos

 +		;;

  	t3e)

 -		basic_machine=t3e-cray

 +		basic_machine=alphaev5-cray

 +		os=-unicos

 +		;;

 +	t90)

 +		basic_machine=t90-cray

  		os=-unicos

  		;;

 +	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

  		;;

 @@ -789,13 +963,17 @@

  		basic_machine=hppa1.1-winbond

  		os=-proelf

  		;;

 -	xmp)

 -		basic_machine=xmp-cray

 -		os=-unicos

 +	windows32)

 +		basic_machine=i386-pc

 +		os=-windows32-msvcrt

  		;;

          xps | xps100)

  		basic_machine=xps100-honeywell

  		;;

 +	ymp)

 +		basic_machine=ymp-cray

 +		os=-unicos

 +		;;

  	z8k-*-coff)

  		basic_machine=z8k-unknown

  		os=-sim

 @@ -816,13 +994,6 @@

  	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

  		;;

 @@ -832,13 +1003,23 @@

  	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 | sh3eb | sh4eb | sh[1234]le | sh3ele)

 +		basic_machine=sh-unknown

 +		;;

 +	sh64)

 +		basic_machine=sh64-unknown

 +		;;

 +	sparc | sparcv9 | sparcv9b)

  		basic_machine=sparc-sun

  		;;

          cydra)

 @@ -860,6 +1041,9 @@

  		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

 @@ -916,14 +1100,31 @@

  	      | -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* | -rhapsody* | -opened* | -openstep* | -oskit*)

 +	      | -interix* | -uwin* | -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*)

  	# Remember, each alternative MUST END IN *, to match a version number.

  		;;

 +	-qnx*)

 +		case $basic_machine in

 +		    x86-* | i*86-*)

 +			;;

 +		    *)

 +			os=-nto$os

 +			;;

 +		esac

 +		;;

 +	-nto*)

 +		os=-nto-qnx

 +		;;

  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \

  	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \

 -	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)

 +	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)

  		;;

  	-mac*)

  		os=`echo $os | sed -e 's|mac|macos|'`

 @@ -940,6 +1141,9 @@

  	-opened*)

  		os=-openedition

  		;;

 +	-wince*)

 +		os=-wince

 +		;;

  	-osfrose*)

  		os=-osfrose

  		;;

 @@ -955,15 +1159,24 @@

  	-acis*)

  		os=-aos

  		;;

 +	-atheos*)

 +		os=-atheos

 +		;;

  	-386bsd)

  		os=-bsd

  		;;

  	-ctix* | -uts*)

  		os=-sysv

  		;;

 +	-nova*)

 +		os=-rtmk-nova

 +		;;

  	-ns2 )

  	        os=-nextstep2

  		;;

 +	-nsk*)

 +		os=-nsk

 +		;;

  	# Preserve the version number of sinix5.

  	-sinix5.*)

  		os=`echo $os | sed -e 's|sinix|sysv|'`

 @@ -977,9 +1190,6 @@

  	-oss*)

  		os=-sysv3

  		;;

 -        -qnx)

 -		os=-qnx4

 -		;;

  	-svr4)

  		os=-sysv4

  		;;

 @@ -1001,7 +1211,7 @@

  	-xenix)

  		os=-xenix

  		;;

 -        -*mint | -*MiNT)

 +        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)

  	        os=-mint

  		;;

  	-none)

 @@ -1035,6 +1245,10 @@

  	arm*-semi)

  		os=-aout

  		;;

 +	# This must come before the *-dec entry.

 +	pdp10-*)

 +		os=-tops20

 +		;;

          pdp11-*)

  		os=-none

  		;;

 @@ -1062,6 +1276,9 @@

  	mips*-*)

  		os=-elf

  		;;

 +	or32-*)

 +		os=-coff

 +		;;

  	*-tti)	# must be before sparc entry or we get the wrong os.

  		os=-sysv3

  		;;

 @@ -1143,7 +1360,7 @@

  	*-masscomp)

  		os=-rtu

  		;;

 -	f301-fujitsu)

 +	f30[01]-fujitsu | f700-fujitsu)

  		os=-uxpv

  		;;

  	*-rom68k)

 @@ -1209,7 +1426,7 @@

  			-ptx*)

  				vendor=sequent

  				;;

 -			-vxsim* | -vxworks*)

 +			-vxsim* | -vxworks* | -windiss*)

  				vendor=wrs

  				;;

  			-aux*)

 @@ -1221,12 +1438,23 @@

  			-mpw* | -macos*)

  				vendor=apple

  				;;

 -			-*mint | -*MiNT)

 +			-*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: