[MinGW-cvs] msys/packages/sh-utils/2.0 ChangeLog.MSYS,NONE,1.1 config.guess,1.1.1.1,1.2 config.sub,1.1.1.1,1.2

[<ea...@us...>]

Update of /cvsroot/mingw/msys/packages/sh-utils/2.0
In directory usw-pr-cvs1:/tmp/cvs-serv28719

Modified Files:
	config.guess config.sub 
Added Files:
	ChangeLog.MSYS 
Log Message:

	* config.guess: Add patterns for msys.
	* config.sub: Ditto.
	* lib/strftime.c: Don't define tzname array for __MSYS__ as it's
	defined already.



--- NEW FILE: ChangeLog.MSYS ---
2002.05.13  Earnie Boyd  <ea...@us...>

	* config.guess: Add patterns for msys.
	* config.sub: Ditto.
	* lib/strftime.c: Don't define tzname array for __MSYS__ as it's
	defined already.

Index: config.guess
===================================================================
RCS file: /cvsroot/mingw/msys/packages/sh-utils/2.0/config.guess,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** config.guess	13 May 2002 20:23:02 -0000	1.1.1.1
--- config.guess	13 May 2002 20:37:28 -0000	1.2
***************
*** 1,7 ****
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
  #   Free Software Foundation, Inc.
! #
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
--- 1,9 ----
  #! /bin/sh
  # Attempt to guess a canonical system name.
[...1340 lines suppressed...]
! /bin/universe          = `(/bin/universe) 2>/dev/null`
! /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
! /bin/arch              = `(/bin/arch) 2>/dev/null`
! /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
! /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
! 
! UNAME_MACHINE = ${UNAME_MACHINE}
! UNAME_RELEASE = ${UNAME_RELEASE}
! UNAME_SYSTEM  = ${UNAME_SYSTEM}
! UNAME_VERSION = ${UNAME_VERSION}
! EOF
  
  exit 1
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:

Index: config.sub
===================================================================
RCS file: /cvsroot/mingw/msys/packages/sh-utils/2.0/config.sub,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** config.sub	13 May 2002 20:23:02 -0000	1.1.1.1
--- config.sub	13 May 2002 20:37:28 -0000	1.2
***************
*** 1,5 ****
  #! /bin/sh
! # Configuration validation subroutine script, version 1.1.
! #   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
--- 1,9 ----
  #! /bin/sh
! # Configuration validation subroutine script.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! #   Free Software Foundation, Inc.
! 
! timestamp='2001-06-08'
! 
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
***************
*** 26,29 ****
--- 30,35 ----
  # the same distribution terms that you use for the rest of that program.
  
+ # Please send patches to <con...@gn...>.
+ #
  # Configuration subroutine to validate and canonicalize a configuration type.
  # Supply the specified configuration type as an argument.
***************
*** 46,66 ****
  # 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
  
! # First pass through any local machine types.
! case $1 in
! 	*local*)
! 		echo $1
! 		exit 0
! 		;;
! 	*)
! 	;;
  esac
  
--- 52,115 ----
  # It is wrong to echo any other type of specification.
  
! me=`echo "$0" | sed -e 's,.*/,,'`
  
! 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 <con...@gn...>."
! 
! 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
  
***************
*** 69,73 ****
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
!   linux-gnu*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
--- 118,122 ----
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
!   nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
***************
*** 95,99 ****
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple)
  		os=
  		basic_machine=$1
--- 144,148 ----
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple | -axis)
  		os=
  		basic_machine=$1
***************
*** 109,112 ****
--- 158,169 ----
  		basic_machine=$1
  		;;
+ 	-chorusos*)
+ 		os=-chorusos
+ 		basic_machine=$1
+ 		;;
+  	-chorusrdb)
+  		os=-chorusrdb
+ 		basic_machine=$1
+  		;;
  	-hiux*)
  		os=-hiuxwe2
***************
*** 167,185 ****
  	# 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)
  		basic_machine=$basic_machine-unknown
  		;;
! 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
  		;;
  
--- 224,255 ----
  	# 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] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
! 		| pyramid | mn10200 | mn10300 | tron | a29k \
  		| 580 | i960 | h8300 \
+ 		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
  		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
! 		| hppa64 \
! 		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
! 		| alphaev6[78] \
! 		| we32k | ns16k | clipper | i370 | sh | sh[34] \
! 		| powerpc | powerpcle \
! 		| 1750a | dsp16xx | pdp10 | pdp11 \
! 		| mips16 | mips64 | mipsel | mips64el \
  		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
  		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
! 		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
! 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
! 		| v850 | c4x \
! 		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
! 		| pj | pjl | h8500 | 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 | v70 | w65 | z8k)
  		;;
  
***************
*** 187,191 ****
  	# because (1) that's what they normally are, and
  	# (2) the word "unknown" tends to confuse beginning users.
! 	i[34567]86)
  	  basic_machine=$basic_machine-pc
  	  ;;
--- 257,261 ----
  	# because (1) that's what they normally are, and
  	# (2) the word "unknown" tends to confuse beginning users.
! 	i*86 | x86_64)
  	  basic_machine=$basic_machine-pc
  	  ;;
***************
*** 197,217 ****
  	# 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-* )
  		;;
  	# Recognize the various machine names and aliases which stand
--- 267,294 ----
  	# Recognize the basic CPU types with company name.
  	# FIXME: clean up the formatting here.
! 	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
! 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
! 	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
  	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
  	      | xmp-* | ymp-* \
! 	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
! 	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
! 	      | hppa2.0n-* | hppa64-* \
! 	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
! 	      | alphaev6[78]-* \
  	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
  	      | clipper-* | orion-* \
! 	      | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \
! 	      | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
! 	      | mips16-* | mips64-* | mipsel-* \
  	      | mips64el-* | mips64orion-* | mips64orionel-* \
  	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
  	      | mipstx39-* | mipstx39el-* | mcore-* \
! 	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
! 	      | [cjt]90-* \
  	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
! 	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
! 	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
  		;;
  	# Recognize the various machine names and aliases which stand
***************
*** 250,261 ****
  		;;
  	amiga | amiga-*)
! 		basic_machine=m68k-cbm
  		;;
  	amigaos | amigados)
! 		basic_machine=m68k-cbm
  		os=-amigaos
  		;;
  	amigaunix | amix)
! 		basic_machine=m68k-cbm
  		os=-sysv4
  		;;
--- 327,338 ----
  		;;
  	amiga | amiga-*)
! 		basic_machine=m68k-unknown
  		;;
  	amigaos | amigados)
! 		basic_machine=m68k-unknown
  		os=-amigaos
  		;;
  	amigaunix | amix)
! 		basic_machine=m68k-unknown
  		os=-sysv4
  		;;
***************
*** 304,309 ****
  		os=-unicos
  		;;
! 	[ctj]90-cray)
! 		basic_machine=c90-cray
  		os=-unicos
  		;;
--- 381,386 ----
  		os=-unicos
  		;;
! 	[cjt]90)
! 		basic_machine=${basic_machine}-cray
  		os=-unicos
  		;;
***************
*** 311,314 ****
--- 388,398 ----
  		basic_machine=m68k-crds
  		;;
+ 	cris | cris-* | etrax*)
+ 		basic_machine=cris-axis
+ 		;;
+ 	cygwin*)
+ 		basic_machine=i586-pc
+ 		os=-cygwin
+ 		;;
  	da30 | da30-*)
  		basic_machine=m68k-da30
***************
*** 358,361 ****
--- 442,449 ----
  		os=-sysv
  		;;
+ 	go32)
+ 		basic_machine=i386-pc
+ 		os=-go32
+ 		;;
  	h3050r* | hiux*)
  		basic_machine=hppa1.1-hitachi
***************
*** 431,450 ****
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
- 		os=-mvs
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
! 	i[34567]86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
  		;;
! 	i[34567]86v4*)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv4
  		;;
! 	i[34567]86v)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv
  		;;
! 	i[34567]86sol2)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-solaris2
--- 519,537 ----
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
! 	i*86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
  		;;
! 	i*86v4*)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv4
  		;;
! 	i*86v)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv
  		;;
! 	i*86sol2)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-solaris2
***************
*** 458,469 ****
  		os=-vsta
  		;;
- 	i386-go32 | go32)
- 		basic_machine=i386-unknown
- 		os=-go32
- 		;;
- 	i386-mingw32 | mingw32)
- 		basic_machine=i386-unknown
- 		os=-mingw32
- 		;;
  	iris | iris4d)
  		basic_machine=mips-sgi
--- 545,548 ----
***************
*** 491,494 ****
--- 570,577 ----
  		os=-sysv
  		;;
+ 	mingw*)
+ 		basic_machine=i586-pc
+ 		os=-mingw
+ 		;;
  	miniframe)
  		basic_machine=m68000-convergent
***************
*** 512,515 ****
--- 595,602 ----
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
  		;;
+ 	mmix*)
+ 		basic_machine=mmix-knuth
+ 		os=-mmixware
+ 		;;
  	monitor)
  		basic_machine=m68k-rom68k
***************
*** 517,523 ****
  		;;
  	msdos)
! 		basic_machine=i386-unknown
  		os=-msdos
  		;;
  	ncr3000)
  		basic_machine=i486-ncr
--- 604,618 ----
  		;;
  	msdos)
! 		basic_machine=i386-pc
  		os=-msdos
  		;;
+ 	msys)
+ 		basic_machine=i386-pc
+ 		os=-msys
+ 		;;
+ 	mvs)
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+ 		;;
  	ncr3000)
  		basic_machine=i486-ncr
***************
*** 529,533 ****
  		;;
  	netwinder)
! 		basic_machine=armv4l-corel
  		os=-linux
  		;;
--- 624,628 ----
  		;;
  	netwinder)
! 		basic_machine=armv4l-rebel
  		os=-linux
  		;;
***************
*** 577,583 ****
--- 672,685 ----
  		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
***************
*** 592,595 ****
--- 694,701 ----
  		os=-os68k
  		;;
+ 	p4w)
+ 		basic_machine=i586-pc
+ 		os=-p4w
+ 		;;
  	pa-hitachi)
  		basic_machine=hppa1.1-hitachi
***************
*** 609,634 ****
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5 | k5 | k6 | nexen)
  		basic_machine=i586-pc
  		;;
! 	pentiumpro | p6 | 6x86)
  		basic_machine=i686-pc
  		;;
  	pentiumii | pentium2)
! 		basic_machine=i786-pc
  		;;
! 	pentium-* | p5-* | k5-* | k6-* | nexen-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	pentiumpro-* | p6-* | 6x86-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pentiumii-* | pentium2-*)
! 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
  		;;
! 	power)	basic_machine=rs6000-ibm
  		;;
  	ppc)	basic_machine=powerpc-unknown
--- 715,740 ----
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5 | k5 | k6 | nexgen)
  		basic_machine=i586-pc
  		;;
! 	pentiumpro | p6 | 6x86 | athlon)
  		basic_machine=i686-pc
  		;;
  	pentiumii | pentium2)
! 		basic_machine=i686-pc
  		;;
! 	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pentiumii-* | pentium2-*)
! 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
  		;;
! 	power)	basic_machine=power-ibm
  		;;
  	ppc)	basic_machine=powerpc-unknown
***************
*** 645,648 ****
--- 751,758 ----
  		basic_machine=i386-ibm
  		;;
+ 	pw32)
+ 		basic_machine=i586-unknown
+ 		os=-pw32
+ 		;;
  	rom68k)
  		basic_machine=m68k-rom68k
***************
*** 724,727 ****
--- 834,841 ----
  		basic_machine=i386-sun
  		;;
+ 	sv1)
+ 		basic_machine=sv1-cray
+ 		os=-unicos
+ 		;;
  	symmetry)
  		basic_machine=i386-sequent
***************
*** 732,735 ****
--- 846,853 ----
  		os=-unicos
  		;;
+ 	tic54x | c54x*)
+ 		basic_machine=tic54x-unknown
+ 		os=-coff
+ 		;;
  	tx39)
  		basic_machine=mipstx39-unknown
***************
*** 784,787 ****
--- 902,909 ----
  		os=-proelf
  		;;
+ 	windows32)
+ 		basic_machine=i386-pc
+ 		os=-windows32-msvcrt
+ 		;;
  	xmp)
  		basic_machine=xmp-cray
***************
*** 827,830 ****
--- 949,956 ----
  		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
***************
*** 833,837 ****
  		basic_machine=we32k-att
  		;;
! 	sparc | sparcv9)
  		basic_machine=sparc-sun
  		;;
--- 959,966 ----
  		basic_machine=we32k-att
  		;;
! 	sh3 | sh4)
! 		basic_machine=sh-unknown
! 		;;
! 	sparc | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
***************
*** 855,858 ****
--- 984,990 ----
  		os=-coff
  		;;
+ 	*-unknown)
+ 		# Make sure to match an already-canonicalized machine name.
+ 		;;
  	*)
  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
***************
*** 911,922 ****
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
! 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
! 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
! 	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
  	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
! 	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
  		;;
  	-mac*)
--- 1043,1069 ----
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
! 	      | -chorusos* | -chorusrdb* \
! 	      | -cygwin* | -msys* | -p4w* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
! 	      | -mingw* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
! 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
! 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
! 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
  	# 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* | -mmixware* | -mon960* | -lnews*)
  		;;
  	-mac*)
***************
*** 932,935 ****
--- 1079,1088 ----
  		os=`echo $os | sed -e 's|sunos6|solaris3|'`
  		;;
+ 	-opened*)
+ 		os=-openedition
+ 		;;
+ 	-wince*)
+ 		os=-wince
+ 		;;
  	-osfrose*)
  		os=-osfrose
***************
*** 956,959 ****
--- 1109,1115 ----
  	        os=-nextstep2
  		;;
+ 	-nsk*)
+ 		os=-nsk
+ 		;;
  	# Preserve the version number of sinix5.
  	-sinix5.*)
***************
*** 990,994 ****
  		os=-xenix
  		;;
!         -*mint | -*MiNT)
  	        os=-mint
  		;;
--- 1146,1150 ----
  		os=-xenix
  		;;
!         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  	        os=-mint
  		;;
***************
*** 1018,1022 ****
  		os=-riscix1.2
  		;;
! 	arm*-corel)
  		os=-linux
  		;;
--- 1174,1178 ----
  		os=-riscix1.2
  		;;
! 	arm*-rebel)
  		os=-linux
  		;;
***************
*** 1024,1027 ****
--- 1180,1186 ----
  		os=-aout
  		;;
+ 	pdp10-*)
+ 		os=-tops20
+ 		;;
          pdp11-*)
  		os=-none
***************
*** 1132,1136 ****
  		os=-rtu
  		;;
! 	f301-fujitsu)
  		os=-uxpv
  		;;
--- 1291,1295 ----
  		os=-rtu
  		;;
! 	f30[01]-fujitsu | f700-fujitsu)
  		os=-uxpv
  		;;
***************
*** 1192,1196 ****
  				vendor=ns
  				;;
! 			-mvs*)
  				vendor=ibm
  				;;
--- 1351,1355 ----
  				vendor=ns
  				;;
! 			-mvs* | -opened*)
  				vendor=ibm
  				;;
***************
*** 1210,1214 ****
  				vendor=apple
  				;;
! 			-*mint | -*MiNT)
  				vendor=atari
  				;;
--- 1369,1373 ----
  				vendor=apple
  				;;
! 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  				vendor=atari
  				;;
***************
*** 1219,1220 ****
--- 1378,1387 ----
  
  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: