===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/config.sub,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -c -r1.1.1.1 -r1.1.1.1.6.1
*** src/usr.bin/sudo/Attic/config.sub	1999/11/18 16:29:01	1.1.1.1
--- src/usr.bin/sudo/Attic/config.sub	2002/01/18 17:20:22	1.1.1.1.6.1
***************
*** 1,6 ****
  #! /bin/sh
! # Configuration validation subroutine script, version 1.1.
! #   Copyright (C) 1991, 92, 93, 94, 95, 1996 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
  # can handle that machine.  It does not imply ALL GNU software can.
--- 1,10 ----
  #! /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
  # can handle that machine.  It does not imply ALL GNU software can.
***************
*** 25,30 ****
--- 29,36 ----
  # 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>.
+ #
  # 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,74 ****
  #	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
  
! # First pass through any local machine types.
! case $1 in
! 	*local*)
! 		echo $1
! 		exit 0
! 		;;
! 	*)
! 	;;
  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*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
--- 51,123 ----
  #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
  # 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 <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
!   nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
***************
*** 94,108 ****
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple)
  		os=
  		basic_machine=$1
  		;;
  	-hiux*)
  		os=-hiuxwe2
  		;;
  	-sco5)
! 		os=sco3.2v5
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-sco4)
--- 143,175 ----
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple | -axis | -sr2201*)
  		os=
  		basic_machine=$1
  		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+ 	-scout)
+ 		;;
+ 	-wrs)
+ 		os=-vxworks
+ 		basic_machine=$1
+ 		;;
+ 	-chorusos*)
+ 		os=-chorusos
+ 		basic_machine=$1
+ 		;;
+  	-chorusrdb)
+  		os=-chorusrdb
+ 		basic_machine=$1
+  		;;
  	-hiux*)
  		os=-hiuxwe2
  		;;
  	-sco5)
! 		os=-sco3.2v5
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-sco4)
***************
*** 121,126 ****
--- 188,196 ----
  		os=-sco3.2v2
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
+ 	-udk*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
  	-isc)
  		os=-isc2.2
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
***************
*** 143,167 ****
  	-psos*)
  		os=-psos
  		;;
  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 | m68k | m68000 | m88k | ns32k | arm \
! 		| arme[lb] | pyramid \
! 		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
! 		| alpha | we32k | ns16k | clipper | i370 | sh \
! 		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
! 		| pdp11 | mips64el | mips64orion | mips64orionel \
! 		| sparc | sparclet | sparclite | sparc64)
  		basic_machine=$basic_machine-unknown
  		;;
  	# 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[3456]86)
  	  basic_machine=$basic_machine-pc
  	  ;;
  	# Object if more than one company name word.
--- 213,262 ----
  	-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 | 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 | mips64vr5000el | 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)
+ 		;;
+ 
  	# 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*86 | x86_64)
  	  basic_machine=$basic_machine-pc
  	  ;;
  	# Object if more than one company name word.
***************
*** 170,192 ****
  		exit 1
  		;;
  	# Recognize the basic CPU types with company name.
! 	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
! 	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
! 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
! 	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
! 	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
! 	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
! 	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
! 	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
  	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
  		basic_machine=m68000-att
  		;;
  	3b*)
  		basic_machine=we32k-att
  		;;
  	alliant | fx80)
  		basic_machine=fx80-alliant
  		;;
--- 265,316 ----
  		exit 1
  		;;
  	# 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
  	# for a CPU type and a company and sometimes even an OS.
+ 	386bsd)
+ 		basic_machine=i386-unknown
+ 		os=-bsd
+ 		;;
  	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
  		basic_machine=m68000-att
  		;;
  	3b*)
  		basic_machine=we32k-att
  		;;
+ 	a29khif)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+ 	adobe68k)
+ 		basic_machine=m68010-adobe
+ 		os=-scout
+ 		;;
  	alliant | fx80)
  		basic_machine=fx80-alliant
  		;;
***************
*** 202,221 ****
  		os=-sysv
  		;;
  	amiga | amiga-*)
! 		basic_machine=m68k-cbm
  		;;
! 	amigados)
! 		basic_machine=m68k-cbm
! 		os=-amigados
  		;;
  	amigaunix | amix)
! 		basic_machine=m68k-cbm
  		os=-sysv4
  		;;
  	apollo68)
  		basic_machine=m68k-apollo
  		os=-sysv
  		;;
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
--- 326,349 ----
  		os=-sysv
  		;;
  	amiga | amiga-*)
! 		basic_machine=m68k-unknown
  		;;
! 	amigaos | amigados)
! 		basic_machine=m68k-unknown
! 		os=-amigaos
  		;;
  	amigaunix | amix)
! 		basic_machine=m68k-unknown
  		os=-sysv4
  		;;
  	apollo68)
  		basic_machine=m68k-apollo
  		os=-sysv
  		;;
+ 	apollo68bsd)
+ 		basic_machine=m68k-apollo
+ 		os=-bsd
+ 		;;
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
***************
*** 252,264 ****
  		basic_machine=cray2-cray
  		os=-unicos
  		;;
! 	[ctj]90-cray)
! 		basic_machine=c90-cray
  		os=-unicos
  		;;
  	crds | unos)
  		basic_machine=m68k-crds
  		;;
  	da30 | da30-*)
  		basic_machine=m68k-da30
  		;;
--- 380,395 ----
  		basic_machine=cray2-cray
  		os=-unicos
  		;;
! 	[cjt]90)
! 		basic_machine=${basic_machine}-cray
  		os=-unicos
  		;;
  	crds | unos)
  		basic_machine=m68k-crds
  		;;
+ 	cris | cris-* | etrax*)
+ 		basic_machine=cris-axis
+ 		;;
  	da30 | da30-*)
  		basic_machine=m68k-da30
  		;;
***************
*** 292,297 ****
--- 423,432 ----
  	encore | umax | mmax)
  		basic_machine=ns32k-encore
  		;;
+ 	es1800 | OSE68k | ose68k | ose | OSE)
+ 		basic_machine=m68k-ericsson
+ 		os=-ose
+ 		;;
  	fx2800)
  		basic_machine=i860-alliant
  		;;
***************
*** 302,307 ****
--- 437,446 ----
  		basic_machine=tron-gmicro
  		os=-sysv
  		;;
+ 	go32)
+ 		basic_machine=i386-pc
+ 		os=-go32
+ 		;;
  	h3050r* | hiux*)
  		basic_machine=hppa1.1-hitachi
  		os=-hiuxwe2
***************
*** 310,315 ****
--- 449,462 ----
  		basic_machine=h8300-hitachi
  		os=-hms
  		;;
+ 	h8300xray)
+ 		basic_machine=h8300-hitachi
+ 		os=-xray
+ 		;;
+ 	h8500hms)
+ 		basic_machine=h8500-hitachi
+ 		os=-hms
+ 		;;
  	sr2201*)
  		basic_machine=harp1e-hitachi
  		os=-hiuxmpp
***************
*** 329,370 ****
  		basic_machine=m68k-hp
  		os=-hpux
  		;;
  	hp9k2[0-9][0-9] | hp9k31[0-9])
  		basic_machine=m68000-hp
  		;;
  	hp9k3[2-9][0-9])
  		basic_machine=m68k-hp
  		;;
! 	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
  		basic_machine=hppa1.1-hp
  		;;
  	hp9k8[0-9][0-9] | hp8[0-9][0-9])
  		basic_machine=hppa1.0-hp
  		;;
  	hppa-next)
  		os=-nextstep3
  		;;
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
- 		os=-mvs
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
! 	i[3456]86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
  		;;
! 	i[3456]86v4*)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv4
  		;;
! 	i[3456]86v)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv
  		;;
! 	i[3456]86sol2)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-solaris2
  		;;
  	iris | iris4d)
  		basic_machine=mips-sgi
  		case $os in
--- 476,549 ----
  		basic_machine=m68k-hp
  		os=-hpux
  		;;
+ 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ 		basic_machine=hppa1.0-hp
+ 		;;
  	hp9k2[0-9][0-9] | hp9k31[0-9])
  		basic_machine=m68000-hp
  		;;
  	hp9k3[2-9][0-9])
  		basic_machine=m68k-hp
  		;;
! 	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])
  		basic_machine=hppa1.1-hp
  		;;
+ 	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)
+ 		# FIXME: really hppa2.0-hp
+ 		basic_machine=hppa1.1-hp
+ 		;;
+ 	hp9k8[0-9][13679] | hp8[0-9][13679])
+ 		basic_machine=hppa1.1-hp
+ 		;;
  	hp9k8[0-9][0-9] | hp8[0-9][0-9])
  		basic_machine=hppa1.0-hp
  		;;
  	hppa-next)
  		os=-nextstep3
  		;;
+ 	hppaosf)
+ 		basic_machine=hppa1.1-hp
+ 		os=-osf
+ 		;;
+ 	hppro)
+ 		basic_machine=hppa1.1-hp
+ 		os=-proelf
+ 		;;
  	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
  		;;
+ 	i386mach)
+ 		basic_machine=i386-mach
+ 		os=-mach
+ 		;;
+ 	i386-vsta | vsta)
+ 		basic_machine=i386-unknown
+ 		os=-vsta
+ 		;;
  	iris | iris4d)
  		basic_machine=mips-sgi
  		case $os in
***************
*** 390,408 ****
--- 569,627 ----
  		basic_machine=ns32k-utek
  		os=-sysv
  		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+ 		;;
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
+ 	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ 		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
+ 		;;
+ 	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
+ 		os=-netbsd
+ 		;;
+ 	netwinder)
+ 		basic_machine=armv4l-rebel
+ 		os=-linux
+ 		;;
  	news | news700 | news800 | news900)
  		basic_machine=m68k-sony
  		os=-newsos
***************
*** 415,420 ****
--- 634,643 ----
  		basic_machine=mips-sony
  		os=-newsos
  		;;
+ 	necv70)
+ 		basic_machine=v70-nec
+ 		os=-sysv
+ 		;;
  	next | m*-next )
  		basic_machine=m68k-next
  		case $os in
***************
*** 440,448 ****
--- 663,694 ----
  		basic_machine=i960-intel
  		os=-nindy
  		;;
+ 	mon960)
+ 		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
+ 		;;
+ 	OSE68000 | ose68000)
+ 		basic_machine=m68000-ericsson
+ 		os=-ose
+ 		;;
+ 	os68k)
+ 		basic_machine=m68k-none
+ 		os=-os68k
+ 		;;
  	pa-hitachi)
  		basic_machine=hppa1.1-hitachi
  		os=-hiuxwe2
***************
*** 460,489 ****
          pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5)
! 		basic_machine=i586-intel
  		;;
! 	pentiumpro | p6)
! 		basic_machine=i686-intel
  		;;
! 	pentium-* | p5-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	pentiumpro-* | p6-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	k5)
! 		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
! 		basic_machine=i586-amd
  		;;
- 	nexen)
- 		# We don't have specific support for Nexgen yet, so just call it a Pentium
- 		basic_machine=i586-nexgen
- 		;;
  	pn)
  		basic_machine=pn-gould
  		;;
! 	power)	basic_machine=rs6000-ibm
  		;;
  	ppc)	basic_machine=powerpc-unknown
  	        ;;
--- 706,733 ----
          pc532 | pc532-*)
  		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
  	        ;;
***************
*** 498,509 ****
--- 742,765 ----
  	ps2)
  		basic_machine=i386-ibm
  		;;
+ 	pw32)
+ 		basic_machine=i586-unknown
+ 		os=-pw32
+ 		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+ 		;;
  	rm[46]00)
  		basic_machine=mips-siemens
  		;;
  	rtpc | rtpc-*)
  		basic_machine=romp-ibm
  		;;
+ 	sa29200)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
  	sequent)
  		basic_machine=i386-sequent
  		;;
***************
*** 511,516 ****
--- 767,776 ----
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
+ 	sparclite-wrs)
+ 		basic_machine=sparclite-wrs
+ 		os=-vxworks
+ 		;;
  	sps7)
  		basic_machine=m68k-bull
  		os=-sysv2
***************
*** 518,523 ****
--- 778,790 ----
  	spur)
  		basic_machine=spur-unknown
  		;;
+ 	st2000)
+ 		basic_machine=m68k-tandem
+ 		;;
+ 	stratus)
+ 		basic_machine=i860-stratus
+ 		os=-sysv4
+ 		;;
  	sun2)
  		basic_machine=m68000-sun
  		;;
***************
*** 558,567 ****
--- 825,852 ----
  	sun386 | sun386i | roadrunner)
  		basic_machine=i386-sun
  		;;
+ 	sv1)
+ 		basic_machine=sv1-cray
+ 		os=-unicos
+ 		;;
  	symmetry)
  		basic_machine=i386-sequent
  		os=-dynix
  		;;
+ 	t3e)
+ 		basic_machine=t3e-cray
+ 		os=-unicos
+ 		;;
+ 	tic54x | c54x*)
+ 		basic_machine=tic54x-unknown
+ 		os=-coff
+ 		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+ 	tx39el)
+ 		basic_machine=mipstx39el-unknown
+ 		;;
  	tower | tower-32)
  		basic_machine=m68k-ncr
  		;;
***************
*** 573,578 ****
--- 858,867 ----
  		basic_machine=a29k-nyu
  		os=-sym1
  		;;
+ 	v810 | necv810)
+ 		basic_machine=v810-nec
+ 		os=-none
+ 		;;
  	vaxv)
  		basic_machine=vax-dec
  		os=-sysv
***************
*** 581,587 ****
  		basic_machine=vax-dec
  		os=-vms
  		;;
!        vpp*|vx|vx-*)
                 basic_machine=f301-fujitsu
                 ;;
  	vxworks960)
--- 870,876 ----
  		basic_machine=vax-dec
  		os=-vms
  		;;
! 	vpp*|vx|vx-*)
                 basic_machine=f301-fujitsu
                 ;;
  	vxworks960)
***************
*** 596,601 ****
--- 885,902 ----
  		basic_machine=a29k-wrs
  		os=-vxworks
  		;;
+ 	w65*)
+ 		basic_machine=w65-wdc
+ 		os=-none
+ 		;;
+ 	w89k-*)
+ 		basic_machine=hppa1.1-winbond
+ 		os=-proelf
+ 		;;
+ 	windows32)
+ 		basic_machine=i386-pc
+ 		os=-windows32-msvcrt
+ 		;;
  	xmp)
  		basic_machine=xmp-cray
  		os=-unicos
***************
*** 603,608 ****
--- 904,913 ----
          xps | xps100)
  		basic_machine=xps100-honeywell
  		;;
+ 	z8k-*-coff)
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
  	none)
  		basic_machine=none-none
  		os=-none
***************
*** 610,617 ****
  
  # 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.
  	mips)
! 		basic_machine=mips-mips
  		;;
  	romp)
  		basic_machine=romp-ibm
--- 915,935 ----
  
  # 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)
+ 		basic_machine=hppa1.1-winbond
+ 		;;
+ 	op50n)
+ 		basic_machine=hppa1.1-oki
+ 		;;
+ 	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
***************
*** 622,634 ****
  	vax)
  		basic_machine=vax-dec
  		;;
  	pdp11)
  		basic_machine=pdp11-dec
  		;;
  	we32k)
  		basic_machine=we32k-att
  		;;
! 	sparc)
  		basic_machine=sparc-sun
  		;;
          cydra)
--- 940,959 ----
  	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
  		;;
! 	sh3 | sh4)
! 		basic_machine=sh-unknown
! 		;;
! 	sparc | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
          cydra)
***************
*** 640,645 ****
--- 965,983 ----
  	orion105)
  		basic_machine=clipper-highlevel
  		;;
+ 	mac | mpw | mac-mpw)
+ 		basic_machine=m68k-apple
+ 		;;
+ 	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
***************
*** 672,680 ****
  	-solaris)
  		os=-solaris2
  		;;
! 	-unixware* | svr4*)
  		os=-sysv4
  		;;
  	-gnu/linux*)
  		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  		;;
--- 1010,1021 ----
  	-solaris)
  		os=-solaris2
  		;;
! 	-svr4*)
  		os=-sysv4
  		;;
+ 	-unixware*)
+ 		os=-sysv4.2uw
+ 		;;
  	-gnu/linux*)
  		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  		;;
***************
*** 685,701 ****
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
  	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
! 	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
! 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
! 	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
! 	      | -linux-gnu* | -uxpv*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-linux*)
  		os=`echo $os | sed -e 's|linux|linux-gnu|'`
  		;;
--- 1026,1066 ----
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
  	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
! 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
! 	      | -aos* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
! 	      | -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* | -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*)
+ 		os=`echo $os | sed -e 's|mac|macos|'`
+ 		;;
  	-linux*)
  		os=`echo $os | sed -e 's|linux|linux-gnu|'`
  		;;
***************
*** 705,710 ****
--- 1070,1081 ----
  	-sunos6*)
  		os=`echo $os | sed -e 's|sunos6|solaris3|'`
  		;;
+ 	-opened*)
+ 		os=-openedition
+ 		;;
+ 	-wince*)
+ 		os=-wince
+ 		;;
  	-osfrose*)
  		os=-osfrose
  		;;
***************
*** 720,731 ****
--- 1091,1108 ----
  	-acis*)
  		os=-aos
  		;;
+ 	-386bsd)
+ 		os=-bsd
+ 		;;
  	-ctix* | -uts*)
  		os=-sysv
  		;;
  	-ns2 )
  	        os=-nextstep2
  		;;
+ 	-nsk*)
+ 		os=-nsk
+ 		;;
  	# Preserve the version number of sinix5.
  	-sinix5.*)
  		os=`echo $os | sed -e 's|sinix|sysv|'`
***************
*** 751,759 ****
--- 1128,1145 ----
  	# This must come after -sysvr4.
  	-sysv*)
  		;;
+ 	-ose*)
+ 		os=-ose
+ 		;;
+ 	-es1800*)
+ 		os=-ose
+ 		;;
  	-xenix)
  		os=-xenix
  		;;
+         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 	        os=-mint
+ 		;;
  	-none)
  		;;
  	*)
***************
*** 779,787 ****
--- 1165,1179 ----
  	*-acorn)
  		os=-riscix1.2
  		;;
+ 	arm*-rebel)
+ 		os=-linux
+ 		;;
  	arm*-semi)
  		os=-aout
  		;;
+ 	pdp10-*)
+ 		os=-tops20
+ 		;;
          pdp11-*)
  		os=-none
  		;;
***************
*** 800,814 ****
--- 1192,1227 ----
  		# default.
  		# os=-sunos4
  		;;
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
+ 	mips*-cisco)
+ 		os=-elf
+ 		;;
+ 	mips*-*)
+ 		os=-elf
+ 		;;
  	*-tti)	# must be before sparc entry or we get the wrong os.
  		os=-sysv3
  		;;
  	sparc-* | *-sun)
  		os=-sunos4.1.1
  		;;
+ 	*-be)
+ 		os=-beos
+ 		;;
  	*-ibm)
  		os=-aix
  		;;
+ 	*-wec)
+ 		os=-proelf
+ 		;;
+ 	*-winbond)
+ 		os=-proelf
+ 		;;
+ 	*-oki)
+ 		os=-proelf
+ 		;;
  	*-hp)
  		os=-hpux
  		;;
***************
*** 819,825 ****
  		os=-sysv
  		;;
  	*-cbm)
! 		os=-amigados
  		;;
  	*-dg)
  		os=-dgux
--- 1232,1238 ----
  		os=-sysv
  		;;
  	*-cbm)
! 		os=-amigaos
  		;;
  	*-dg)
  		os=-dgux
***************
*** 869,877 ****
  	*-masscomp)
  		os=-rtu
  		;;
! 	f301-fujitsu)
  		os=-uxpv
  		;;
  	*)
  		os=-none
  		;;
--- 1282,1302 ----
  	*-masscomp)
  		os=-rtu
  		;;
! 	f30[01]-fujitsu | f700-fujitsu)
  		os=-uxpv
  		;;
+ 	*-rom68k)
+ 		os=-coff
+ 		;;
+ 	*-*bug)
+ 		os=-coff
+ 		;;
+ 	*-apple)
+ 		os=-macos
+ 		;;
+ 	*-atari*)
+ 		os=-mint
+ 		;;
  	*)
  		os=-none
  		;;
***************
*** 893,901 ****
--- 1318,1332 ----
  			-aix*)
  				vendor=ibm
  				;;
+ 			-beos*)
+ 				vendor=be
+ 				;;
  			-hpux*)
  				vendor=hp
  				;;
+ 			-mpeix*)
+ 				vendor=hp
+ 				;;
  			-hiux*)
  				vendor=hitachi
  				;;
***************
*** 911,917 ****
  			-genix*)
  				vendor=ns
  				;;
! 			-mvs*)
  				vendor=ibm
  				;;
  			-ptx*)
--- 1342,1348 ----
  			-genix*)
  				vendor=ns
  				;;
! 			-mvs* | -opened*)
  				vendor=ibm
  				;;
  			-ptx*)
***************
*** 923,931 ****
--- 1354,1379 ----
  			-aux*)
  				vendor=apple
  				;;
+ 			-hms*)
+ 				vendor=hitachi
+ 				;;
+ 			-mpw* | -macos*)
+ 				vendor=apple
+ 				;;
+ 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 				vendor=atari
+ 				;;
  		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: