[lwatch-cvs] files config.guess,1.4,1.5 config.sub,1.4,1.5

[Artur R. C. <ar...@us...>]

Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19911

Modified Files:
	config.guess config.sub 
Log Message:
Update config.{guess,sub} to 2004-03-12


Index: config.guess
===================================================================
RCS file: /cvsroot/lwatch/files/config.guess,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** config.guess	18 Mar 2003 16:34:34 -0000	1.4
--- config.guess	9 Aug 2004 00:30:41 -0000	1.5
***************
*** 2,8 ****
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002 Free Software Foundation, Inc.
  
! timestamp='2002-09-03'
  
  # This file is free software; you can redistribute it and/or modify it
--- 2,8 ----
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  
! timestamp='2004-03-12'
  
  # This file is free software; you can redistribute it and/or modify it
***************
*** 99,118 ****
  # use `HOST_CC' if defined, but it is deprecated.
  
! # This shell variable is my proudest work .. or something. --bje
  
! set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
! (old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
!    || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
! dummy=$tmpdir/dummy ;
! files="$dummy.c $dummy.o $dummy.rel $dummy" ;
! trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
  case $CC_FOR_BUILD,$HOST_CC,$CC in
   ,,)    echo "int x;" > $dummy.c ;
  	for c in cc gcc c89 c99 ; do
! 	  if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
  	     CC_FOR_BUILD="$c"; break ;
  	  fi ;
  	done ;
- 	rm -f $files ;
  	if test x"$CC_FOR_BUILD" = x ; then
  	  CC_FOR_BUILD=no_compiler_found ;
--- 99,121 ----
  # use `HOST_CC' if defined, but it is deprecated.
  
! # Portable tmp directory creation inspired by the Autoconf team.
  
! set_cc_for_build='
! trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
! : ${TMPDIR=/tmp} ;
!  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
!  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
!  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
!  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
! dummy=$tmp/dummy ;
! tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
  case $CC_FOR_BUILD,$HOST_CC,$CC in
   ,,)    echo "int x;" > $dummy.c ;
  	for c in cc gcc c89 c99 ; do
! 	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
  	     CC_FOR_BUILD="$c"; break ;
  	  fi ;
  	done ;
  	if test x"$CC_FOR_BUILD" = x ; then
  	  CC_FOR_BUILD=no_compiler_found ;
***************
*** 121,126 ****
   ,,*)   CC_FOR_BUILD=$CC ;;
   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
! esac ;
! unset files'
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
--- 124,128 ----
   ,,*)   CC_FOR_BUILD=$CC ;;
   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
! esac ;'
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
***************
*** 179,183 ****
  	esac
  	# The OS release
! 	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
  	# contains redundant information, the shorter form:
--- 181,196 ----
  	esac
  	# The OS release
! 	# Debian GNU/NetBSD machines have a different userland, and
! 	# thus, need a distinct triplet. However, they do not need
! 	# kernel version information, so it can be replaced with a
! 	# suitable tag, in the style of linux-gnu.
! 	case "${UNAME_VERSION}" in
! 	    Debian*)
! 		release='-gnu'
! 		;;
! 	    *)
! 		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
! 		;;
! 	esac
  	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
  	# contains redundant information, the shorter form:
***************
*** 185,188 ****
--- 198,204 ----
  	echo "${machine}-${os}${release}"
  	exit 0 ;;
+     amd64:OpenBSD:*:*)
+ 	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
      amiga:OpenBSD:*:*)
  	echo m68k-unknown-openbsd${UNAME_RELEASE}
***************
*** 191,194 ****
--- 207,213 ----
  	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
+     cats:OpenBSD:*:*)
+ 	echo arm-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
      hp300:OpenBSD:*:*)
  	echo m68k-unknown-openbsd${UNAME_RELEASE}
***************
*** 209,212 ****
--- 228,234 ----
  	echo powerpc-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
+     pegasos:OpenBSD:*:*)
+ 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
      pmax:OpenBSD:*:*)
  	echo mipsel-unknown-openbsd${UNAME_RELEASE}
***************
*** 224,292 ****
  	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      alpha:OSF1:*:*)
! 	if test $UNAME_RELEASE = "V4.0"; then
  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
! 	fi
  	# A Vn.n version is a released version.
  	# A Tn.n version is a released field test version.
  	# A Xn.n version is an unreleased experimental baselevel.
  	# 1.2 uses "1.2" for uname -r.
! 	eval $set_cc_for_build
! 	cat <<EOF >$dummy.s
! 	.data
! \$Lformat:
! 	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
! 
! 	.text
! 	.globl main
! 	.align 4
! 	.ent main
! main:
! 	.frame \$30,16,\$26,0
! 	ldgp \$29,0(\$27)
! 	.prologue 1
! 	.long 0x47e03d80 # implver \$0
! 	lda \$2,-1
! 	.long 0x47e20c21 # amask \$2,\$1
! 	lda \$16,\$Lformat
! 	mov \$0,\$17
! 	not \$1,\$18
! 	jsr \$26,printf
! 	ldgp \$29,0(\$26)
! 	mov 0,\$16
! 	jsr \$26,exit
! 	.end main
! EOF
! 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
! 	if test "$?" = 0 ; then
! 		case `$dummy` in
! 			0-0)
! 				UNAME_MACHINE="alpha"
! 				;;
! 			1-0)
! 				UNAME_MACHINE="alphaev5"
! 				;;
! 			1-1)
! 				UNAME_MACHINE="alphaev56"
! 				;;
! 			1-101)
! 				UNAME_MACHINE="alphapca56"
! 				;;
! 			2-303)
! 				UNAME_MACHINE="alphaev6"
! 				;;
! 			2-307)
! 				UNAME_MACHINE="alphaev67"
! 				;;
! 			2-1307)
! 				UNAME_MACHINE="alphaev68"
! 				;;
! 			3-1307)
! 				UNAME_MACHINE="alphaev7"
! 				;;
! 		esac
! 	fi
! 	rm -f $dummy.s $dummy && rmdir $tmpdir
! 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
  	exit 0 ;;
      Alpha\ *:Windows_NT*:*)
--- 246,313 ----
  	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
+     *:ekkoBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     macppc:MirBSD:*:*)
+ 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:MirBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ 	exit 0 ;;
      alpha:OSF1:*:*)
! 	case $UNAME_RELEASE in
! 	*4.0)
  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
! 		;;
! 	*5.*)
! 	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
! 		;;
! 	esac
! 	# According to Compaq, /usr/sbin/psrinfo has been available on
! 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
! 	# covers most systems running today.  This code pipes the CPU
! 	# types through head -n 1, so we only detect the type of CPU 0.
! 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
! 	case "$ALPHA_CPU_TYPE" in
! 	    "EV4 (21064)")
! 		UNAME_MACHINE="alpha" ;;
! 	    "EV4.5 (21064)")
! 		UNAME_MACHINE="alpha" ;;
! 	    "LCA4 (21066/21068)")
! 		UNAME_MACHINE="alpha" ;;
! 	    "EV5 (21164)")
! 		UNAME_MACHINE="alphaev5" ;;
! 	    "EV5.6 (21164A)")
! 		UNAME_MACHINE="alphaev56" ;;
! 	    "EV5.6 (21164PC)")
! 		UNAME_MACHINE="alphapca56" ;;
! 	    "EV5.7 (21164PC)")
! 		UNAME_MACHINE="alphapca57" ;;
! 	    "EV6 (21264)")
! 		UNAME_MACHINE="alphaev6" ;;
! 	    "EV6.7 (21264A)")
! 		UNAME_MACHINE="alphaev67" ;;
! 	    "EV6.8CB (21264C)")
! 		UNAME_MACHINE="alphaev68" ;;
! 	    "EV6.8AL (21264B)")
! 		UNAME_MACHINE="alphaev68" ;;
! 	    "EV6.8CX (21264D)")
! 		UNAME_MACHINE="alphaev68" ;;
! 	    "EV6.9A (21264/EV69A)")
! 		UNAME_MACHINE="alphaev69" ;;
! 	    "EV7 (21364)")
! 		UNAME_MACHINE="alphaev7" ;;
! 	    "EV7.9 (21364A)")
! 		UNAME_MACHINE="alphaev79" ;;
! 	esac
! 	# A Pn.n version is a patched version.
  	# A Vn.n version is a released version.
  	# A Tn.n version is a released field test version.
  	# A Xn.n version is an unreleased experimental baselevel.
  	# 1.2 uses "1.2" for uname -r.
! 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
! 	exit 0 ;;
!     Alpha*:OpenVMS:*:*)
! 	echo alpha-hp-vms
  	exit 0 ;;
      Alpha\ *:Windows_NT*:*)
***************
*** 311,314 ****
--- 332,338 ----
  	echo i370-ibm-openedition
  	exit 0 ;;
+     *:OS400:*:*)
+         echo powerpc-ibm-os400
+ 	exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
***************
*** 328,331 ****
--- 352,358 ----
  	echo pyramid-pyramid-svr4
  	exit 0 ;;
+     DRS?6000:unix:4.0:6*)
+ 	echo sparc-icl-nx6
+ 	exit 0 ;;
      DRS?6000:UNIX_SV:4.2*:7*)
  	case `/usr/bin/uname -p` in
***************
*** 400,403 ****
--- 427,433 ----
          echo m68k-unknown-mint${UNAME_RELEASE}
          exit 0 ;;
+     m68k:machten:*:*)
+ 	echo m68k-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
      powerpc:machten:*:*)
  	echo powerpc-apple-machten${UNAME_RELEASE}
***************
*** 438,445 ****
  	}
  EOF
! 	$CC_FOR_BUILD $dummy.c -o $dummy \
  	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
! 	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
! 	rm -f $dummy.c $dummy && rmdir $tmpdir
  	echo mips-mips-riscos${UNAME_RELEASE}
  	exit 0 ;;
--- 468,474 ----
  	}
  EOF
! 	$CC_FOR_BUILD -o $dummy $dummy.c \
  	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
! 	  && exit 0
  	echo mips-mips-riscos${UNAME_RELEASE}
  	exit 0 ;;
***************
*** 450,454 ****
  	echo powerpc-harris-powermax
  	exit 0 ;;
!     Night_Hawk:*:*:PowerMAX_OS)
  	echo powerpc-harris-powermax
  	exit 0 ;;
--- 479,483 ----
  	echo powerpc-harris-powermax
  	exit 0 ;;
!     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
  	echo powerpc-harris-powermax
  	exit 0 ;;
***************
*** 525,530 ****
  			}
  EOF
! 		$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
! 		rm -f $dummy.c $dummy && rmdir $tmpdir
  		echo rs6000-ibm-aix3.2.5
  	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
--- 554,558 ----
  			}
  EOF
! 		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
  		echo rs6000-ibm-aix3.2.5
  	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
***************
*** 624,632 ****
                }
  EOF
! 		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy`
! 		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
! 		    rm -f $dummy.c $dummy && rmdir $tmpdir
  		fi ;;
  	esac
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
  	exit 0 ;;
--- 652,670 ----
                }
  EOF
! 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
! 		    test -z "$HP_ARCH" && HP_ARCH=hppa
  		fi ;;
  	esac
+ 	if [ ${HP_ARCH} = "hppa2.0w" ]
+ 	then
+ 	    # avoid double evaluation of $set_cc_for_build
+ 	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+ 		HP_ARCH="hppa64"
+ 	    fi
+ 	fi
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
  	exit 0 ;;
***************
*** 662,667 ****
  	}
  EOF
! 	$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
! 	rm -f $dummy.c $dummy && rmdir $tmpdir
  	echo unknown-hitachi-hiuxwe2
  	exit 0 ;;
--- 700,704 ----
  	}
  EOF
! 	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
  	echo unknown-hitachi-hiuxwe2
  	exit 0 ;;
***************
*** 721,727 ****
  	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
-     CRAY*T3D:*:*:*)
- 	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
      CRAY*T3E:*:*:*)
  	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--- 758,761 ----
***************
*** 730,733 ****
--- 764,770 ----
  	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
+     *:UNICOS/mp:*:*)
+ 	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
***************
*** 736,739 ****
--- 773,781 ----
          echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
          exit 0 ;;
+     5000:UNIX_System_V:4.*:*)
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ 	exit 0 ;;
      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
***************
*** 757,762 ****
  EOF
  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
! 	rm -f $dummy.c && rmdir $tmpdir
! 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
  	exit 0 ;;
      i*:CYGWIN*:*)
--- 799,806 ----
  EOF
  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
! 	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
! 	# FreeBSD's kernel, but not the complete OS.
! 	case ${LIBC} in gnu) kernel_only='k' ;; esac
! 	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
  	exit 0 ;;
      i*:CYGWIN*:*)
***************
*** 769,774 ****
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit 0 ;;
!     x86:Interix*:3*)
! 	echo i386-pc-interix3
  	exit 0 ;;
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
--- 813,821 ----
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit 0 ;;
!     x86:Interix*:[34]*)
! 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
! 	exit 0 ;;
!     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
! 	echo i${UNAME_MACHINE}-pc-mks
  	exit 0 ;;
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
***************
*** 776,780 ****
  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
  	# UNAME_MACHINE based on the output of uname instead of i386?
! 	echo i386-pc-interix
  	exit 0 ;;
      i*:UWIN*:*)
--- 823,827 ----
  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
  	# UNAME_MACHINE based on the output of uname instead of i386?
! 	echo i586-pc-interix
  	exit 0 ;;
      i*:UWIN*:*)
***************
*** 788,793 ****
--- 835,845 ----
  	exit 0 ;;
      *:GNU:*:*)
+ 	# the GNU system
  	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  	exit 0 ;;
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+ 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ 	exit 0 ;;
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
***************
*** 796,802 ****
--- 848,860 ----
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit 0 ;;
+     cris:Linux:*:*)
+ 	echo cris-axis-linux-gnu
+ 	exit 0 ;;
      ia64:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit 0 ;;
+     m32r*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
      m68*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
***************
*** 819,824 ****
  EOF
  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
! 	rm -f $dummy.c && rmdir $tmpdir
! 	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
  	;;
      ppc:Linux:*:*)
--- 877,900 ----
  EOF
  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
! 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
! 	;;
!     mips64:Linux:*:*)
! 	eval $set_cc_for_build
! 	sed 's/^	//' << EOF >$dummy.c
! 	#undef CPU
! 	#undef mips64
! 	#undef mips64el
! 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
! 	CPU=mips64el
! 	#else
! 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
! 	CPU=mips64
! 	#else
! 	CPU=
! 	#endif
! 	#endif
! EOF
! 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
! 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
  	;;
      ppc:Linux:*:*)
***************
*** 856,859 ****
--- 932,938 ----
  	echo ${UNAME_MACHINE}-ibm-linux
  	exit 0 ;;
+     sh64*:Linux:*:*)
+     	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
      sh*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
***************
*** 913,919 ****
  	#endif
  	#endif
  EOF
  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- 	rm -f $dummy.c && rmdir $tmpdir
  	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
  	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
--- 992,1000 ----
  	#endif
  	#endif
+ 	#ifdef __dietlibc__
+ 	LIBC=dietlibc
+ 	#endif
  EOF
  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
  	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
  	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
***************
*** 933,936 ****
--- 1014,1037 ----
  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
  	exit 0 ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+ 	echo ${UNAME_MACHINE}-pc-os2-emx
+ 	exit 0 ;;
+     i*86:XTS-300:*:STOP)
+ 	echo ${UNAME_MACHINE}-unknown-stop
+ 	exit 0 ;;
+     i*86:atheos:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-atheos
+ 	exit 0 ;;
+ 	i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+ 	exit 0 ;;
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     i*86:*DOS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ 	exit 0 ;;
      i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
  	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
***************
*** 967,973 ****
  	fi
  	exit 0 ;;
-     i*86:*DOS:*:*)
- 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
- 	exit 0 ;;
      pc:*:*:*)
  	# Left here for compatibility:
--- 1068,1071 ----
***************
*** 996,1002 ****
  	echo m68k-convergent-sysv
  	exit 0 ;;
      M68*:*:R3V[567]*:*)
  	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
!     3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
  	OS_REL=''
  	test -r /etc/.relid \
--- 1094,1103 ----
  	echo m68k-convergent-sysv
  	exit 0 ;;
+     M680?0:D-NIX:5.3:*)
+ 	echo m68k-diab-dnix
+ 	exit 0 ;;
      M68*:*:R3V[567]*:*)
  	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
!     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
  	OS_REL=''
  	test -r /etc/.relid \
***************
*** 1015,1021 ****
  	echo m68k-atari-sysv4
  	exit 0 ;;
-     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
- 	exit 0 ;;
      TSUNAMI:LynxOS:2.*:*)
  	echo sparc-unknown-lynxos${UNAME_RELEASE}
--- 1116,1119 ----
***************
*** 1099,1103 ****
  	exit 0 ;;
      *:Darwin:*:*)
! 	echo `uname -p`-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
--- 1197,1205 ----
  	exit 0 ;;
      *:Darwin:*:*)
! 	case `uname -p` in
! 	    *86) UNAME_PROCESSOR=i686 ;;
! 	    powerpc) UNAME_PROCESSOR=powerpc ;;
! 	esac
! 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
***************
*** 1112,1116 ****
  	echo i386-pc-qnx
  	exit 0 ;;
!     NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
  	echo nsr-tandem-nsk${UNAME_RELEASE}
  	exit 0 ;;
--- 1214,1218 ----
  	echo i386-pc-qnx
  	exit 0 ;;
!     NSR-?:NONSTOP_KERNEL:*:*)
  	echo nsr-tandem-nsk${UNAME_RELEASE}
  	exit 0 ;;
***************
*** 1135,1143 ****
  	echo ${UNAME_MACHINE}-unknown-plan9
  	exit 0 ;;
-     i*86:OS/2:*:*)
- 	# If we were able to find `uname', then EMX Unix compatibility
- 	# is probably installed.
- 	echo ${UNAME_MACHINE}-pc-os2-emx
- 	exit 0 ;;
      *:TOPS-10:*:*)
  	echo pdp10-unknown-tops10
--- 1237,1240 ----
***************
*** 1158,1166 ****
  	echo pdp10-unknown-its
  	exit 0 ;;
!     i*86:XTS-300:*:STOP)
! 	echo ${UNAME_MACHINE}-unknown-stop
  	exit 0 ;;
!     i*86:atheos:*:*)
! 	echo ${UNAME_MACHINE}-unknown-atheos
  	exit 0 ;;
  esac
--- 1255,1263 ----
  	echo pdp10-unknown-its
  	exit 0 ;;
!     SEI:*:*:SEIUX)
!         echo mips-sei-seiux${UNAME_RELEASE}
  	exit 0 ;;
!     *:DragonFly:*:*)
! 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  	exit 0 ;;
  esac
***************
*** 1284,1289 ****
  EOF
  
! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
! rm -f $dummy.c $dummy && rmdir $tmpdir
  
  # Apollos put the system type in the environment.
--- 1381,1385 ----
  EOF
  
! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
  
  # Apollos put the system type in the environment.

Index: config.sub
===================================================================
RCS file: /cvsroot/lwatch/files/config.sub,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** config.sub	18 Mar 2003 16:34:39 -0000	1.4
--- config.sub	9 Aug 2004 00:30:41 -0000	1.5
***************
*** 2,8 ****
  # 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.
--- 2,8 ----
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  
! timestamp='2004-03-12'
  
  # This file is (in principle) common to ALL GNU software.
***************
*** 119,123 ****
  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/'`
--- 119,124 ----
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
!   nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
!   kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
***************
*** 229,240 ****
  	| 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 \
--- 230,242 ----
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
  	| 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 | iq2000 \
! 	| m32r | m32rle | m68000 | m68k | m88k | mcore \
  	| mips | mipsbe | mipseb | mipsel | mipsle \
  	| mips16 \
***************
*** 246,254 ****
--- 248,259 ----
  	| mips64vr5000 | mips64vr5000el \
  	| mipsisa32 | mipsisa32el \
+ 	| mipsisa32r2 | mipsisa32r2el \
  	| mipsisa64 | mipsisa64el \
+ 	| mipsisa64r2 | mipsisa64r2el \
  	| mipsisa64sb1 | mipsisa64sb1el \
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
+ 	| msp430 \
  	| ns16k | ns32k \
  	| openrisc | or32 \
***************
*** 256,264 ****
  	| 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 \
--- 261,269 ----
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
! 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
  	| sh64 | sh64le \
! 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
  	| strongarm \
! 	| tahoe | thumb | tic4x | tic80 | tron \
  	| v850 | v850e \
  	| we32k \
***************
*** 295,299 ****
  	| avr-* \
  	| bs2000-* \
! 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
  	| clipper-* | cydra-* \
  	| d10v-* | d30v-* | dlx-* \
--- 300,304 ----
  	| avr-* \
  	| bs2000-* \
! 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
  	| clipper-* | cydra-* \
  	| d10v-* | d30v-* | dlx-* \
***************
*** 303,308 ****
  	| 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-* \
--- 308,313 ----
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
! 	| ip2k-* | iq2000-* \
! 	| m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
  	| m88110-* | m88k-* | mcore-* \
***************
*** 316,324 ****
  	| mips64vr5000-* | mips64vr5000el-* \
  	| mipsisa32-* | mipsisa32el-* \
  	| mipsisa64-* | mipsisa64el-* \
  	| mipsisa64sb1-* | mipsisa64sb1el-* \
  	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
! 	| mipstx39 | mipstx39el \
! 	| none-* | np1-* | ns16k-* | ns32k-* \
  	| orion-* \
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
--- 321,332 ----
  	| mips64vr5000-* | mips64vr5000el-* \
  	| mipsisa32-* | mipsisa32el-* \
+ 	| mipsisa32r2-* | mipsisa32r2el-* \
  	| mipsisa64-* | mipsisa64el-* \
+ 	| mipsisa64r2-* | mipsisa64r2el-* \
  	| mipsisa64sb1-* | mipsisa64sb1el-* \
  	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
! 	| mipstx39-* | mipstx39el-* \
! 	| msp430-* \
! 	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
  	| orion-* \
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
***************
*** 326,334 ****
  	| 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-* \
--- 334,344 ----
  	| pyramid-* \
  	| romp-* | rs6000-* \
! 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
  	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
! 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
! 	| tahoe-* | thumb-* \
! 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
! 	| tron-* \
  	| v850-* | v850e-* | vax-* \
  	| we32k-* \
***************
*** 354,357 ****
--- 364,370 ----
  		os=-udi
  		;;
+     	abacus)
+ 		basic_machine=abacus-unknown
+ 		;;
  	adobe68k)
  		basic_machine=m68010-adobe
***************
*** 368,371 ****
--- 381,390 ----
  		os=-bsd
  		;;
+ 	amd64)
+ 		basic_machine=x86_64-pc
+ 		;;
+ 	amd64-*)
+ 		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
  	amdahl)
  		basic_machine=580-amdahl
***************
*** 427,430 ****
--- 446,453 ----
  		os=-unicos
  		;;
+ 	cr16c)
+ 		basic_machine=cr16c-unknown
+ 		os=-elf
+ 		;;
  	crds | unos)
  		basic_machine=m68k-crds
***************
*** 433,436 ****
--- 456,463 ----
  		basic_machine=cris-axis
  		;;
+ 	crx)
+ 		basic_machine=crx-unknown
+ 		os=-elf
+ 		;;
  	da30 | da30-*)
  		basic_machine=m68k-da30
***************
*** 717,720 ****
--- 744,751 ----
  		basic_machine=np1-gould
  		;;
+ 	nv1)
+ 		basic_machine=nv1-cray
+ 		os=-unicosmp
+ 		;;
  	nsr-tandem)
  		basic_machine=nsr-tandem
***************
*** 728,731 ****
--- 759,766 ----
  		os=-coff
  		;;
+ 	os400)
+ 		basic_machine=powerpc-ibm
+ 		os=-os400
+ 		;;
  	OSE68000 | ose68000)
  		basic_machine=m68000-ericsson
***************
*** 759,765 ****
  		basic_machine=i686-pc
  		;;
! 	pentiumii | pentium2)
  		basic_machine=i686-pc
  		;;
  	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
--- 794,803 ----
  		basic_machine=i686-pc
  		;;
! 	pentiumii | pentium2 | pentiumiii | pentium3)
  		basic_machine=i686-pc
  		;;
+ 	pentium4)
+ 		basic_machine=i786-pc
+ 		;;
  	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
***************
*** 768,774 ****
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	pentiumii-* | pentium2-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
--- 806,815 ----
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
+ 	pentium4-*)
+ 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
  	pn)
  		basic_machine=pn-gould
***************
*** 829,832 ****
--- 870,877 ----
  		basic_machine=mipsisa64sb1el-unknown
  		;;
+ 	sei)
+ 		basic_machine=mips-sei
+ 		os=-seiux
+ 		;;
  	sequent)
  		basic_machine=i386-sequent
***************
*** 836,839 ****
--- 881,887 ----
  		os=-hms
  		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
  	sparclite-wrs | simso-wrs)
  		basic_machine=sparclite-wrs
***************
*** 902,909 ****
  		os=-dynix
  		;;
- 	t3d)
- 		basic_machine=alpha-cray
- 		os=-unicos
- 		;;
  	t3e)
  		basic_machine=alphaev5-cray
--- 950,953 ----
***************
*** 914,925 ****
  		os=-unicos
  		;;
-         tic4x | c4x*)
- 		basic_machine=tic4x-unknown
- 		os=-coff
- 		;;
  	tic54x | c54x*)
  		basic_machine=tic54x-unknown
  		os=-coff
  		;;
  	tx39)
  		basic_machine=mipstx39-unknown
--- 958,973 ----
  		os=-unicos
  		;;
  	tic54x | c54x*)
  		basic_machine=tic54x-unknown
  		os=-coff
  		;;
+ 	tic55x | c55x*)
+ 		basic_machine=tic55x-unknown
+ 		os=-coff
+ 		;;
+ 	tic6x | c6x*)
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
  	tx39)
  		basic_machine=mipstx39-unknown
***************
*** 935,938 ****
--- 983,990 ----
  		basic_machine=m68k-ncr
  		;;
+ 	tpf)
+ 		basic_machine=s390x-ibm
+ 		os=-tpf
+ 		;;
  	udi29k)
  		basic_machine=a29k-amd
***************
*** 978,985 ****
  		os=-proelf
  		;;
- 	windows32)
- 		basic_machine=i386-pc
- 		os=-windows32-msvcrt
- 		;;
  	xps | xps100)
  		basic_machine=xps100-honeywell
--- 1030,1033 ----
***************
*** 1028,1032 ****
  		basic_machine=we32k-att
  		;;
! 	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
  		basic_machine=sh-unknown
  		;;
--- 1076,1080 ----
  		basic_machine=we32k-att
  		;;
! 	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
  		basic_machine=sh-unknown
  		;;
***************
*** 1034,1038 ****
  		basic_machine=sh64-unknown
  		;;
! 	sparc | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
--- 1082,1086 ----
  		basic_machine=sh64-unknown
  		;;
! 	sparc | sparcv8 | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
***************
*** 1107,1122 ****
  	      | -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* | -vos* | -palmos* | -uclinux* | -nucleus* \
! 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
--- 1155,1172 ----
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
! 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
! 	      | -ekkobsd* | -kfreebsd* | -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* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
! 	      | -interix* | -uwin* | -mks* | -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* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
***************
*** 1130,1135 ****
  		esac
  		;;
  	-nto*)
! 		os=-nto-qnx
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--- 1180,1187 ----
  		esac
  		;;
+ 	-nto-qnx*)
+ 		;;
  	-nto*)
! 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
***************
*** 1140,1143 ****
--- 1192,1198 ----
  		os=`echo $os | sed -e 's|mac|macos|'`
  		;;
+ 	-linux-dietlibc)
+ 		os=-linux-dietlibc
+ 		;;
  	-linux*)
  		os=`echo $os | sed -e 's|linux|linux-gnu|'`
***************
*** 1152,1155 ****
--- 1207,1213 ----
  		os=-openedition
  		;;
+         -os400*)
+ 		os=-os400
+ 		;;
  	-wince*)
  		os=-wince
***************
*** 1173,1176 ****
--- 1231,1237 ----
  		os=-atheos
  		;;
+ 	-syllable*)
+ 		os=-syllable
+ 		;;
  	-386bsd)
  		os=-bsd
***************
*** 1195,1198 ****
--- 1256,1262 ----
  		os=-sysv4
  		;;
+         -tpf*)
+ 		os=-tpf
+ 		;;
  	-triton*)
  		os=-sysv3
***************
*** 1225,1228 ****
--- 1289,1298 ----
  		os=-mint
  		;;
+ 	-aros*)
+ 		os=-aros
+ 		;;
+ 	-kaos*)
+ 		os=-kaos
+ 		;;
  	-none)
  		;;
***************
*** 1256,1259 ****
--- 1326,1332 ----
  		os=-aout
  		;;
+     c4x-* | tic4x-*)
+         os=-coff
+         ;;
  	# This must come before the *-dec entry.
  	pdp10-*)
***************
*** 1434,1440 ****
--- 1507,1519 ----
  				vendor=ibm
  				;;
+ 			-os400*)
+ 				vendor=ibm
+ 				;;
  			-ptx*)
  				vendor=sequent
  				;;
+ 			-tpf*)
+ 				vendor=ibm
+ 				;;
  			-vxsim* | -vxworks* | -windiss*)
  				vendor=wrs