Changes to gnats/config.sub

Milan Zamazal <[email protected]> Mon, 13 Jan 2003 08:19:06 -0500
Newsgroups gmane.comp.bug-tracking.gnats.patches
Message-ID <[email protected]>
Index: gnats/config.sub
diff -c gnats/config.sub:1.3 gnats/config.sub:1.4
*** gnats/config.sub:1.3	Wed Aug 29 16:25:49 2001
--- gnats/config.sub	Mon Jan 13 08:19:04 2003
***************
*** 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-08-02'
  
  # 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, 2002 Free Software Foundation, Inc.
  
! timestamp='2002-09-05'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
***************
*** 29,35 ****
  # 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 <[email protected]>.
  #
  # Configuration subroutine to validate and canonicalize a configuration type.
  # Supply the specified configuration type as an argument.
--- 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 <[email protected]>.  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.
***************
*** 117,123 ****
  # 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/'`
      ;;
--- 118,124 ----
  # 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* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
***************
*** 226,256 ****
  	1750a | 580 \
  	| a29k \
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
! 	| c4x | clipper \
! 	| d10v | d30v | dsp16xx \
! 	| fr30 \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
  	| m32r | m68000 | m68k | m88k | mcore \
! 	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
! 	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
! 	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
! 	| mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
  	| ns16k | ns32k \
! 	| openrisc \
  	| pdp10 | pdp11 | pj | pjl \
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
! 	| s390 | s390x \
! 	| sh | sh[34] | sh[34]eb | shbe | shle \
! 	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
  	| strongarm \
  	| tahoe | thumb | tic80 | tron \
! 	| v850 \
  	| we32k \
! 	| x86 | xscale \
  	| z8k)
  		basic_machine=$basic_machine-unknown
  		;;
--- 227,268 ----
  	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 \
! 	| mipsisa64 | mipsisa64el \
! 	| mipsisa64sb1 | mipsisa64sb1el \
! 	| mipsisa64sr71k | mipsisa64sr71kel \
! 	| 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
  		;;
***************
*** 277,313 ****
  	580-* \
  	| a29k-* \
  	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
! 	| alphapca5[67]-* | arc-* \
! 	| arm-*  | armbe-* | armle-* | armv*-* \
  	| bs2000-* \
! 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
! 	| clipper-* | cray2-* | cydra-* \
! 	| d10v-* | d30v-* \
! 	| f30[01]-* | f700-* | fr30-* | fx80-* \
  	| h8300-* | h8500-* \
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
  	| m32r-* \
! 	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
  	| m88110-* | m88k-* | mcore-* \
! 	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
! 	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
! 	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \
! 	| mipsle-* | mipstx39-* | mipstx39el-* \
  	| none-* | np1-* | ns16k-* | ns32k-* \
  	| orion-* \
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
  	| romp-* | rs6000-* \
! 	| s390-* | s390x-* \
! 	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
! 	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
! 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
! 	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
! 	| v850-* | vax-* \
  	| we32k-* \
! 	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
  	| ymp-* \
  	| z8k-*)
  		;;
--- 289,339 ----
  	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-* \
! 	| mipsisa64-* | mipsisa64el-* \
! 	| mipsisa64sb1-* | mipsisa64sb1el-* \
! 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
! 	| 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-* | tic4x-* | tic54x-* | tic80-* | tron-* \
! 	| v850-* | v850e-* | vax-* \
  	| we32k-* \
! 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
! 	| xtensa-* \
  	| ymp-* \
  	| z8k-*)
  		;;
***************
*** 372,377 ****
--- 398,407 ----
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+ 		;;
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
***************
*** 392,407 ****
  		basic_machine=c38-convex
  		os=-bsd
  		;;
! 	cray | ymp)
! 		basic_machine=ymp-cray
! 		os=-unicos
! 		;;
! 	cray2)
! 		basic_machine=cray2-cray
! 		os=-unicos
! 		;;
! 	[cjt]90)
! 		basic_machine=${basic_machine}-cray
  		os=-unicos
  		;;
  	crds | unos)
--- 422,429 ----
  		basic_machine=c38-convex
  		os=-bsd
  		;;
! 	cray | j90)
! 		basic_machine=j90-cray
  		os=-unicos
  		;;
  	crds | unos)
***************
*** 416,421 ****
--- 438,451 ----
  	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
***************
*** 596,609 ****
  		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/'`
  		;;
--- 626,631 ----
***************
*** 618,623 ****
--- 640,649 ----
  		basic_machine=m68k-rom68k
  		os=-coff
  		;;
+ 	morphos)
+ 		basic_machine=powerpc-unknown
+ 		os=-morphos
+ 		;;
  	msdos)
  		basic_machine=i386-pc
  		os=-msdos
***************
*** 697,702 ****
--- 723,732 ----
  		basic_machine=hppa1.1-oki
  		os=-proelf
  		;;
+ 	or32 | or32-*)
+ 		basic_machine=or32-unknown
+ 		os=-coff
+ 		;;
  	OSE68000 | ose68000)
  		basic_machine=m68000-ericsson
  		os=-ose
***************
*** 719,737 ****
  	pbb)
  		basic_machine=m68k-tti
  		;;
!         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-*)
--- 749,767 ----
  	pbb)
  		basic_machine=m68k-tti
  		;;
! 	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
! 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
  		basic_machine=i686-pc
  		;;
  	pentiumii | pentium2)
  		basic_machine=i686-pc
  		;;
! 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pentiumpro-* | p6-* | 6x86-* | athlon-*)
***************
*** 746,767 ****
  	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/^[^-]*-//'`
  		;;
--- 776,797 ----
  	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/^[^-]*-//'`
  		;;
***************
*** 782,791 ****
--- 812,833 ----
  	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
  		;;
+ 	sb1)
+ 		basic_machine=mipsisa64sb1-unknown
+ 		;;
+ 	sb1el)
+ 		basic_machine=mipsisa64sb1el-unknown
+ 		;;
  	sequent)
  		basic_machine=i386-sequent
  		;;
***************
*** 793,799 ****
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
! 	sparclite-wrs)
  		basic_machine=sparclite-wrs
  		os=-vxworks
  		;;
--- 835,841 ----
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
! 	sparclite-wrs | simso-wrs)
  		basic_machine=sparclite-wrs
  		os=-vxworks
  		;;
***************
*** 859,868 ****
  		basic_machine=i386-sequent
  		os=-dynix
  		;;
  	t3e)
! 		basic_machine=t3e-cray
  		os=-unicos
  		;;
  	tic54x | c54x*)
  		basic_machine=tic54x-unknown
  		os=-coff
--- 901,922 ----
  		basic_machine=i386-sequent
  		os=-dynix
  		;;
+ 	t3d)
+ 		basic_machine=alpha-cray
+ 		os=-unicos
+ 		;;
  	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
***************
*** 873,878 ****
--- 927,936 ----
  	tx39el)
  		basic_machine=mipstx39el-unknown
  		;;
+ 	toad1)
+ 		basic_machine=pdp10-xkl
+ 		os=-tops20
+ 		;;
  	tower | tower-32)
  		basic_machine=m68k-ncr
  		;;
***************
*** 897,904 ****
  		os=-vms
  		;;
  	vpp*|vx|vx-*)
!                basic_machine=f301-fujitsu
!                ;;
  	vxworks960)
  		basic_machine=i960-wrs
  		os=-vxworks
--- 955,962 ----
  		os=-vms
  		;;
  	vpp*|vx|vx-*)
! 		basic_machine=f301-fujitsu
! 		;;
  	vxworks960)
  		basic_machine=i960-wrs
  		os=-vxworks
***************
*** 923,935 ****
  		basic_machine=i386-pc
  		os=-windows32-msvcrt
  		;;
! 	xmp)
! 		basic_machine=xmp-cray
! 		os=-unicos
! 		;;
!         xps | xps100)
  		basic_machine=xps100-honeywell
  		;;
  	z8k-*-coff)
  		basic_machine=z8k-unknown
  		os=-sim
--- 981,993 ----
  		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
***************
*** 950,962 ****
  	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
  		;;
--- 1008,1013 ----
***************
*** 976,988 ****
  	we32k)
  		basic_machine=we32k-att
  		;;
! 	sh3 | sh4 | sh3eb | sh4eb)
  		basic_machine=sh-unknown
  		;;
  	sparc | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
!         cydra)
  		basic_machine=cydra-cydrome
  		;;
  	orion)
--- 1027,1042 ----
  	we32k)
  		basic_machine=we32k-att
  		;;
! 	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)
  		basic_machine=cydra-cydrome
  		;;
  	orion)
***************
*** 997,1006 ****
  	pmac | pmac-mpw)
  		basic_machine=powerpc-apple
  		;;
- 	c4x*)
- 		basic_machine=c4x-none
- 		os=-coff
- 		;;
  	*-unknown)
  		# Make sure to match an already-canonicalized machine name.
  		;;
--- 1051,1056 ----
***************
*** 1066,1072 ****
  	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
! 	      | -os2* | -vos*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
--- 1116,1123 ----
  	      | -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*)
***************
*** 1118,1131 ****
  	-acis*)
  		os=-aos
  		;;
  	-386bsd)
  		os=-bsd
  		;;
  	-ctix* | -uts*)
  		os=-sysv
  		;;
  	-ns2 )
! 	        os=-nextstep2
  		;;
  	-nsk*)
  		os=-nsk
--- 1169,1188 ----
  	-acis*)
  		os=-aos
  		;;
+ 	-atheos*)
+ 		os=-atheos
+ 		;;
  	-386bsd)
  		os=-bsd
  		;;
  	-ctix* | -uts*)
  		os=-sysv
  		;;
+ 	-nova*)
+ 		os=-rtmk-nova
+ 		;;
  	-ns2 )
! 		os=-nextstep2
  		;;
  	-nsk*)
  		os=-nsk
***************
*** 1164,1171 ****
  	-xenix)
  		os=-xenix
  		;;
!         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
! 	        os=-mint
  		;;
  	-none)
  		;;
--- 1221,1228 ----
  	-xenix)
  		os=-xenix
  		;;
! 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
! 		os=-mint
  		;;
  	-none)
  		;;
***************
*** 1198,1207 ****
  	arm*-semi)
  		os=-aout
  		;;
  	pdp10-*)
  		os=-tops20
  		;;
!         pdp11-*)
  		os=-none
  		;;
  	*-dec | vax-*)
--- 1255,1265 ----
  	arm*-semi)
  		os=-aout
  		;;
+ 	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
  		;;
! 	pdp11-*)
  		os=-none
  		;;
  	*-dec | vax-*)
***************
*** 1228,1233 ****
--- 1286,1294 ----
  	mips*-*)
  		os=-elf
  		;;
+ 	or32-*)
+ 		os=-coff
+ 		;;
  	*-tti)	# must be before sparc entry or we get the wrong os.
  		os=-sysv3
  		;;
***************
*** 1291,1309 ****
  	*-next)
  		os=-nextstep3
  		;;
!         *-gould)
  		os=-sysv
  		;;
!         *-highlevel)
  		os=-bsd
  		;;
  	*-encore)
  		os=-bsd
  		;;
!         *-sgi)
  		os=-irix
  		;;
!         *-siemens)
  		os=-sysv4
  		;;
  	*-masscomp)
--- 1352,1370 ----
  	*-next)
  		os=-nextstep3
  		;;
! 	*-gould)
  		os=-sysv
  		;;
! 	*-highlevel)
  		os=-bsd
  		;;
  	*-encore)
  		os=-bsd
  		;;
! 	*-sgi)
  		os=-irix
  		;;
! 	*-siemens)
  		os=-sysv4
  		;;
  	*-masscomp)
***************
*** 1375,1381 ****
  			-ptx*)
  				vendor=sequent
  				;;
! 			-vxsim* | -vxworks*)
  				vendor=wrs
  				;;
  			-aux*)
--- 1436,1442 ----
  			-ptx*)
  				vendor=sequent
  				;;
! 			-vxsim* | -vxworks* | -windiss*)
  				vendor=wrs
  				;;
  			-aux*)