*** config.guess.org	Mon Mar 27 14:37:46 2000
--- config.guess	Fri Jul 28 22:29:17 2000
***************
*** 863,885 ****
  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
  	exit 0 ;;
      i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
! 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
  	else
! 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
  	fi
  	exit 0 ;;
!     i?86:*:5:7)
!        UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
!        (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
!        (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
!                && UNAME_MACHINE=i586
!        (/bin/uname -X|egrep '^Machine.*PentII' >/dev/null) \
!                && UNAME_MACHINE=i686
!        (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
!                && UNAME_MACHINE=i686
!        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
!        exit 0 ;;
      i?86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
  		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
--- 863,884 ----
  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
  	exit 0 ;;
      i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
! 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
  	else
! 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
  	fi
  	exit 0 ;;
!     i?86:*:5:7*)
!         # Fixed at (any) Pentium or better
!         UNAME_MACHINE=i586
!         if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
! 	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
! 	else
! 	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
! 	fi
! 	exit 0 ;;
      i?86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
  		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
***************
*** 889,904 ****
  		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
  		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
  			&& UNAME_MACHINE=i586
! 		(/bin/uname -X|egrep '^Machine.*PentII' >/dev/null) \
  			&& UNAME_MACHINE=i686
!                 (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
!                         && UNAME_MACHINE=i686
  		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
  	else
  		echo ${UNAME_MACHINE}-pc-sysv32
  	fi
  	exit 0 ;;
      pc:*:*:*)
          # uname -m prints for DJGPP always 'pc', but it prints nothing about
          # the processor, so we play safe by assuming i386.
  	echo i386-pc-msdosdjgpp
--- 888,907 ----
  		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
  		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
  			&& UNAME_MACHINE=i586
! 		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
  			&& UNAME_MACHINE=i686
! 		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
! 			&& UNAME_MACHINE=i686
  		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
  	else
  		echo ${UNAME_MACHINE}-pc-sysv32
  	fi
  	exit 0 ;;
+     i?86:*DOS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ 	exit 0 ;;
      pc:*:*:*)
+ 	# Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing about
          # the processor, so we play safe by assuming i386.
  	echo i386-pc-msdosdjgpp
***************
*** 950,955 ****
--- 953,961 ----
  	exit 0 ;;
      SM[BE]S:UNIX_SV:*:*)
  	echo mips-dde-sysv${UNAME_RELEASE}
+ 	exit 0 ;;
+     RM*:ReliantUNIX-*:*:*)
+ 	echo mips-sni-sysv4
  	exit 0 ;;
      RM*:SINIX-*:*:*)
  	echo mips-sni-sysv4