[xplc-cvs] xplc config.guess,1.3,1.4 config.sub,1.3,1.4

[Simon L. <sf...@us...>]

Update of /cvsroot/xplc/xplc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26433

Modified Files:
	config.guess config.sub 
Log Message:
Update with new autoconf host guessing.


Index: config.guess
===================================================================
RCS file: /cvsroot/xplc/xplc/config.guess,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** config.guess	14 Nov 2003 21:25:14 -0000	1.3
--- config.guess	21 Oct 2005 16:22:49 -0000	1.4
***************
*** 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-05-29'
  
  # 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, 2004, 2005 Free Software Foundation, Inc.
  
! timestamp='2005-04-22'
  
  # This file is free software; you can redistribute it and/or modify it
***************
*** 54,58 ****
  
  Originally written by Per Bothner.
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  Free Software Foundation, Inc.
  
--- 54,58 ----
  
  Originally written by Per Bothner.
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
  Free Software Foundation, Inc.
  
***************
*** 89,109 ****
  fi
  
  
! dummy=dummy-$$
! trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
  
- # CC_FOR_BUILD -- compiler used by this script.
  # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
  # use `HOST_CC' if defined, but it is deprecated.
  
! set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
!  ,,)    echo "int dummy(){}" > $dummy.c ;
  	for c in cc gcc c89 c99 ; do
! 	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
! 	  if test $? = 0 ; then
  	     CC_FOR_BUILD="$c"; break ;
  	  fi ;
  	done ;
- 	rm -f $dummy.c $dummy.o $dummy.rel ;
  	if test x"$CC_FOR_BUILD" = x ; then
  	  CC_FOR_BUILD=no_compiler_found ;
--- 89,121 ----
  fi
  
+ trap 'exit 1' 1 2 15
  
! # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
! # compiler to aid in system detection is discouraged as it requires
! # temporary files to be created and, as you can see below, it is a
! # headache to deal with in a portable fashion.
  
  # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
  # 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 ;
***************
*** 112,116 ****
   ,,*)   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.
--- 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.
***************
*** 169,173 ****
  	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:
***************
*** 175,187 ****
  	echo "${machine}-${os}${release}"
  	exit 0 ;;
      amiga:OpenBSD:*:*)
  	echo m68k-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
!     arc:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      hp300:OpenBSD:*:*)
  	echo m68k-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      mac68k:OpenBSD:*:*)
  	echo m68k-unknown-openbsd${UNAME_RELEASE}
--- 198,216 ----
  	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}
  	exit 0 ;;
!     cats:OpenBSD:*:*)
! 	echo arm-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      hp300:OpenBSD:*:*)
  	echo m68k-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
+     luna88k:OpenBSD:*:*)
+     	echo m88k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
      mac68k:OpenBSD:*:*)
  	echo m68k-unknown-openbsd${UNAME_RELEASE}
***************
*** 199,279 ****
  	echo powerpc-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
-     pmax:OpenBSD:*:*)
- 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
      sgi:OpenBSD:*:*)
! 	echo mipseb-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      sun3:OpenBSD:*:*)
  	echo m68k-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
-     wgrisc:OpenBSD:*:*)
- 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
      *:OpenBSD:*:*)
  	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.
! 	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
! 	eval $set_cc_for_build
! 	$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"
! 				;;
! 		esac
! 	fi
! 	rm -f $dummy.s $dummy
! 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
  	exit 0 ;;
      Alpha\ *:Windows_NT*:*)
--- 228,301 ----
  	echo powerpc-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      sgi:OpenBSD:*:*)
! 	echo mips64-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      sun3:OpenBSD:*:*)
  	echo m68k-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      *:OpenBSD:*:*)
  	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\ *:Windows_NT*:*)
***************
*** 298,301 ****
--- 320,329 ----
  	echo i370-ibm-openedition
  	exit 0 ;;
+     *:z/VM:*:*)
+ 	echo s390-ibm-zvmoe
+ 	exit 0 ;;
+     *:OS400:*:*)
+         echo powerpc-ibm-os400
+ 	exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
***************
*** 315,318 ****
--- 343,353 ----
  	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* | DRS?6000:isis:4.2*:7*)
+ 	case `/usr/bin/uname -p` in
+ 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+ 	esac ;;
      sun4H:SunOS:5.*:*)
  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
***************
*** 383,386 ****
--- 418,424 ----
          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}
***************
*** 421,428 ****
  	}
  EOF
! 	$CC_FOR_BUILD $dummy.c -o $dummy \
! 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
! 	  && rm -f $dummy.c $dummy && exit 0
! 	rm -f $dummy.c $dummy
  	echo mips-mips-riscos${UNAME_RELEASE}
  	exit 0 ;;
--- 459,465 ----
  	}
  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 ;;
***************
*** 430,434 ****
  	echo powerpc-motorola-powermax
  	exit 0 ;;
!     Night_Hawk:*:*:PowerMAX_OS)
  	echo powerpc-harris-powermax
  	exit 0 ;;
--- 467,474 ----
  	echo powerpc-motorola-powermax
  	exit 0 ;;
!     Motorola:*:4.3:PL8-*)
! 	echo powerpc-harris-powermax
! 	exit 0 ;;
!     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
  	echo powerpc-harris-powermax
  	exit 0 ;;
***************
*** 505,510 ****
  			}
  EOF
! 		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
! 		rm -f $dummy.c $dummy
  		echo rs6000-ibm-aix3.2.5
  	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
--- 545,549 ----
  			}
  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
***************
*** 604,612 ****
                }
  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
  		fi ;;
  	esac
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
  	exit 0 ;;
--- 643,661 ----
                }
  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 ;;
***************
*** 642,647 ****
  	}
  EOF
! 	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
! 	rm -f $dummy.c $dummy
  	echo unknown-hitachi-hiuxwe2
  	exit 0 ;;
--- 691,695 ----
  	}
  EOF
! 	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
  	echo unknown-hitachi-hiuxwe2
  	exit 0 ;;
***************
*** 701,707 ****
  	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/'
--- 749,752 ----
***************
*** 710,713 ****
--- 755,761 ----
  	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
+     *:UNICOS/mp:*:*)
+ 	echo craynv-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'`
***************
*** 716,719 ****
--- 764,772 ----
          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}
***************
*** 737,742 ****
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit 0 ;;
!     x86:Interix*:3*)
! 	echo i386-pc-interix3
  	exit 0 ;;
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
--- 790,798 ----
  	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*:*)
***************
*** 744,752 ****
  	# 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*:*)
  	echo ${UNAME_MACHINE}-pc-uwin
  	exit 0 ;;
      p*:CYGWIN*:*)
  	echo powerpcle-unknown-cygwin
--- 800,811 ----
  	# 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*:*)
  	echo ${UNAME_MACHINE}-pc-uwin
  	exit 0 ;;
+     amd64:CYGWIN*:*:*)
+ 	echo x86_64-unknown-cygwin
+ 	exit 0 ;;
      p*:CYGWIN*:*)
  	echo powerpcle-unknown-cygwin
***************
*** 756,761 ****
--- 815,825 ----
  	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
***************
*** 764,770 ****
--- 828,846 ----
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit 0 ;;
+     cris:Linux:*:*)
+ 	echo cris-axis-linux-gnu
+ 	exit 0 ;;
+     crisv32:Linux:*:*)
+ 	echo crisv32-axis-linux-gnu
+ 	exit 0 ;;
+     frv:Linux:*:*)
+     	echo frv-unknown-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
***************
*** 787,792 ****
  EOF
  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
! 	rm -f $dummy.c
! 	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
  	;;
      ppc:Linux:*:*)
--- 863,886 ----
  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:*:*)
***************
*** 824,827 ****
--- 918,924 ----
  	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
***************
*** 850,854 ****
  	  a.out-i386-linux)
  		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
! 		exit 0 ;;		
  	  coff-i386)
  		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--- 947,951 ----
  	  a.out-i386-linux)
  		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
! 		exit 0 ;;
  	  coff-i386)
  		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
***************
*** 881,887 ****
  	#endif
  	#endif
  EOF
  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- 	rm -f $dummy.c
  	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
  	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
--- 978,986 ----
  	#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
***************
*** 901,904 ****
--- 1000,1023 ----
  	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$//'`
***************
*** 935,941 ****
  	fi
  	exit 0 ;;
-     i*86:*DOS:*:*)
- 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
- 	exit 0 ;;
      pc:*:*:*)
  	# Left here for compatibility:
--- 1054,1057 ----
***************
*** 961,967 ****
  	echo m68010-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 \
--- 1077,1089 ----
  	echo m68010-convergent-sysv
  	exit 0 ;;
!     mc68k:UNIX:SYSTEM5:3.51m)
! 	echo m68k-convergent-sysv
! 	exit 0 ;;
!     M680?0:D-NIX:5.3:*)
! 	echo m68k-diab-dnix
! 	exit 0 ;;
!     M68*:*:R3V[5678]*:*)
  	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 | S7501*:*:4.0:3.0)
  	OS_REL=''
  	test -r /etc/.relid \
***************
*** 980,986 ****
  	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}
--- 1102,1105 ----
***************
*** 1022,1025 ****
--- 1141,1148 ----
  	echo i860-stratus-sysv4
  	exit 0 ;;
+     i*86:VOS:*:*)
+ 	# From Pau...@st....
+ 	echo ${UNAME_MACHINE}-stratus-vos
+ 	exit 0 ;;
      *:VOS:*:*)
  	# From Pau...@st....
***************
*** 1054,1057 ****
--- 1177,1183 ----
  	echo sx5-nec-superux${UNAME_RELEASE}
  	exit 0 ;;
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+ 	exit 0 ;;
      Power*:Rhapsody:*:*)
  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
***************
*** 1061,1065 ****
  	exit 0 ;;
      *:Darwin:*:*)
! 	echo `uname -p`-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
--- 1187,1196 ----
  	exit 0 ;;
      *:Darwin:*:*)
! 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
! 	case $UNAME_PROCESSOR in
! 	    *86) UNAME_PROCESSOR=i686 ;;
! 	    unknown) UNAME_PROCESSOR=powerpc ;;
! 	esac
! 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
***************
*** 1074,1078 ****
  	echo i386-pc-qnx
  	exit 0 ;;
!     NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
  	echo nsr-tandem-nsk${UNAME_RELEASE}
  	exit 0 ;;
--- 1205,1212 ----
  	echo i386-pc-qnx
  	exit 0 ;;
!     NSE-?:NONSTOP_KERNEL:*:*)
! 	echo nse-tandem-nsk${UNAME_RELEASE}
! 	exit 0 ;;
!     NSR-?:NONSTOP_KERNEL:*:*)
  	echo nsr-tandem-nsk${UNAME_RELEASE}
  	exit 0 ;;
***************
*** 1097,1105 ****
  	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
--- 1231,1234 ----
***************
*** 1120,1128 ****
  	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
--- 1249,1267 ----
  	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 ;;
!     *:*VMS:*:*)
!     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
! 	case "${UNAME_MACHINE}" in
! 	    A*) echo alpha-dec-vms && exit 0 ;;
! 	    I*) echo ia64-dec-vms && exit 0 ;;
! 	    V*) echo vax-dec-vms && exit 0 ;;
! 	esac ;;
!     *:XENIX:*:SysV)
! 	echo i386-pc-xenix
  	exit 0 ;;
  esac
***************
*** 1246,1251 ****
  EOF
  
! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
  
  # Apollos put the system type in the environment.
--- 1385,1389 ----
  EOF
  
! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
  
  # Apollos put the system type in the environment.
***************
*** 1286,1290 ****
  download the most up to date version of the config scripts from
  
!     ftp://ftp.gnu.org/pub/gnu/config/
  
  If the version you run ($0) is already up to date, please
--- 1424,1430 ----
  download the most up to date version of the config scripts from
  
!   http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
! and
!   http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
  
  If the version you run ($0) is already up to date, please

Index: config.sub
===================================================================
RCS file: /cvsroot/xplc/xplc/config.sub,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** config.sub	14 Nov 2003 21:25:14 -0000	1.3
--- config.sub	21 Oct 2005 16:22:49 -0000	1.4
***************
*** 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-06-21'
  
  # 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, 2004, 2005 Free Software Foundation, Inc.
  
! timestamp='2005-04-22'
  
  # This file is (in principle) common to ALL GNU software.
***************
*** 71,75 ****
  GNU config.sub ($timestamp)
  
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  Free Software Foundation, Inc.
  
--- 71,75 ----
  GNU config.sub ($timestamp)
  
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
  Free Software Foundation, Inc.
  
***************
*** 119,123 ****
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
!   nto-qnx* | linux-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/'`
***************
*** 145,149 ****
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple | -axis)
  		os=
  		basic_machine=$1
--- 146,150 ----
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple | -axis | -knuth | -cray)
  		os=
  		basic_machine=$1
***************
*** 229,233 ****
--- 230,236 ----
  	| 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 \
+ 	| bfin \
  	| c4x | clipper \
  	| d10v | d30v | dlx | dsp16xx \
***************
*** 235,243 ****
  	| 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 \
  	| mips64orion | mips64orionel \
  	| mips64vr4100 | mips64vr4100el \
--- 238,247 ----
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
! 	| ip2k | iq2000 \
! 	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
  	| mips | mipsbe | mipseb | mipsel | mipsle \
  	| mips16 \
  	| mips64 | mips64el \
+ 	| mips64vr | mips64vrel \
  	| mips64orion | mips64orionel \
  	| mips64vr4100 | mips64vr4100el \
***************
*** 245,252 ****
--- 249,260 ----
  	| mips64vr5000 | mips64vr5000el \
  	| mipsisa32 | mipsisa32el \
+ 	| mipsisa32r2 | mipsisa32r2el \
  	| mipsisa64 | mipsisa64el \
+ 	| mipsisa64r2 | mipsisa64r2el \
  	| mipsisa64sb1 | mipsisa64sb1el \
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
+ 	| msp430 \
  	| ns16k | ns32k \
  	| openrisc | or32 \
***************
*** 254,265 ****
  	| 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
--- 262,274 ----
  	| 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 | sparc64b | sparc86x | sparclet | sparclite \
! 	| sparcv8 | sparcv9 | sparcv9b \
  	| strongarm \
! 	| tahoe | thumb | tic4x | tic80 | tron \
  	| v850 | v850e \
  	| we32k \
! 	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
  	| z8k)
  		basic_machine=$basic_machine-unknown
***************
*** 292,298 ****
  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
  	| avr-* \
! 	| bs2000-* \
! 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
! 	| clipper-* | cydra-* \
  	| d10v-* | d30v-* | dlx-* \
  	| elxsi-* \
--- 301,307 ----
  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
  	| avr-* \
! 	| bfin-* | bs2000-* \
! 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
! 	| clipper-* | craynv-* | cydra-* \
  	| d10v-* | d30v-* | dlx-* \
  	| elxsi-* \
***************
*** 301,311 ****
  	| 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-* \
  	| mips64orion-* | mips64orionel-* \
  	| mips64vr4100-* | mips64vr4100el-* \
--- 310,321 ----
  	| 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-* | maxq-* | mcore-* \
  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  	| mips16-* \
  	| mips64-* | mips64el-* \
+ 	| mips64vr-* | mips64vrel-* \
  	| mips64orion-* | mips64orionel-* \
  	| mips64vr4100-* | mips64vr4100el-* \
***************
*** 313,319 ****
  	| mips64vr5000-* | mips64vr5000el-* \
  	| mipsisa32-* | mipsisa32el-* \
  	| mipsisa64-* | mipsisa64el-* \
  	| mipsisa64sb1-* | mipsisa64sb1el-* \
! 	| mipstx39 | mipstx39el \
  	| none-* | np1-* | ns16k-* | ns32k-* \
  	| orion-* \
--- 323,334 ----
  	| mips64vr5000-* | mips64vr5000el-* \
  	| mipsisa32-* | mipsisa32el-* \
+ 	| mipsisa32r2-* | mipsisa32r2el-* \
  	| mipsisa64-* | mipsisa64el-* \
+ 	| mipsisa64r2-* | mipsisa64r2el-* \
  	| mipsisa64sb1-* | mipsisa64sb1el-* \
! 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
! 	| mipstx39-* | mipstx39el-* \
! 	| mmix-* \
! 	| msp430-* \
  	| none-* | np1-* | ns16k-* | ns32k-* \
  	| orion-* \
***************
*** 322,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-* | tic54x-* | tic80-* | tron-* \
  	| v850-* | v850e-* | vax-* \
  	| we32k-* \
! 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
! 	| xtensa-* \
  	| ymp-* \
  	| z8k-*)
--- 337,352 ----
  	| pyramid-* \
  	| romp-* | rs6000-* \
! 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
! 	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
! 	| sparclite-* \
! 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
! 	| tahoe-* | thumb-* \
! 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
! 	| tron-* \
  	| v850-* | v850e-* | vax-* \
  	| we32k-* \
! 	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
! 	| xstormy16-* | xtensa-* \
  	| ymp-* \
  	| z8k-*)
***************
*** 350,353 ****
--- 368,374 ----
  		os=-udi
  		;;
+     	abacus)
+ 		basic_machine=abacus-unknown
+ 		;;
  	adobe68k)
  		basic_machine=m68010-adobe
***************
*** 364,367 ****
--- 385,394 ----
  		os=-bsd
  		;;
+ 	amd64)
+ 		basic_machine=x86_64-pc
+ 		;;
+ 	amd64-*)
+ 		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
  	amdahl)
  		basic_machine=580-amdahl
***************
*** 423,432 ****
--- 450,474 ----
  		os=-unicos
  		;;
+ 	craynv)
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+ 	cr16c)
+ 		basic_machine=cr16c-unknown
+ 		os=-elf
+ 		;;
  	crds | unos)
  		basic_machine=m68k-crds
  		;;
+ 	crisv32 | crisv32-* | etraxfs*)
+ 		basic_machine=crisv32-axis
+ 		;;
  	cris | cris-* | etrax*)
  		basic_machine=cris-axis
  		;;
+ 	crx)
+ 		basic_machine=crx-unknown
+ 		os=-elf
+ 		;;
  	da30 | da30-*)
  		basic_machine=m68k-da30
***************
*** 451,454 ****
--- 493,500 ----
  		os=-sysv3
  		;;
+ 	djgpp)
+ 		basic_machine=i586-pc
+ 		os=-msdosdjgpp
+ 		;;
  	dpx20 | dpx20-*)
  		basic_machine=rs6000-bull
***************
*** 629,636 ****
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
  		;;
- 	mmix*)
- 		basic_machine=mmix-knuth
- 		os=-mmixware
- 		;;
  	monitor)
  		basic_machine=m68k-rom68k
--- 675,678 ----
***************
*** 724,727 ****
--- 766,773 ----
  		os=-coff
  		;;
+ 	os400)
+ 		basic_machine=powerpc-ibm
+ 		os=-os400
+ 		;;
  	OSE68000 | ose68000)
  		basic_machine=m68000-ericsson
***************
*** 746,750 ****
  		basic_machine=m68k-tti
  		;;
!         pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
--- 792,796 ----
  		basic_machine=m68k-tti
  		;;
! 	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
***************
*** 752,761 ****
  		basic_machine=i586-pc
  		;;
! 	pentiumpro | p6 | 6x86 | 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/^[^-]*-//'`
--- 798,810 ----
  		basic_machine=i586-pc
  		;;
! 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
  		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/^[^-]*-//'`
***************
*** 764,770 ****
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	pentiumii-* | pentium2-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
--- 813,822 ----
  		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
***************
*** 773,792 ****
  		;;
  	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/^[^-]*-//'`
--- 825,844 ----
  		;;
  	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/^[^-]*-//'`
***************
*** 819,822 ****
--- 871,884 ----
  		os=-udi
  		;;
+ 	sb1)
+ 		basic_machine=mipsisa64sb1-unknown
+ 		;;
+ 	sb1el)
+ 		basic_machine=mipsisa64sb1el-unknown
+ 		;;
+ 	sei)
+ 		basic_machine=mips-sei
+ 		os=-seiux
+ 		;;
  	sequent)
  		basic_machine=i386-sequent
***************
*** 826,829 ****
--- 888,894 ----
  		os=-hms
  		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
  	sparclite-wrs | simso-wrs)
  		basic_machine=sparclite-wrs
***************
*** 884,888 ****
  		basic_machine=i386-sun
  		;;
!         sv1)
  		basic_machine=sv1-cray
  		os=-unicos
--- 949,953 ----
  		basic_machine=i386-sun
  		;;
! 	sv1)
  		basic_machine=sv1-cray
  		os=-unicos
***************
*** 892,899 ****
  		os=-dynix
  		;;
- 	t3d)
- 		basic_machine=alpha-cray
- 		os=-unicos
- 		;;
  	t3e)
  		basic_machine=alphaev5-cray
--- 957,960 ----
***************
*** 908,911 ****
--- 969,980 ----
  		os=-coff
  		;;
+ 	tic55x | c55x*)
+ 		basic_machine=tic55x-unknown
+ 		os=-coff
+ 		;;
+ 	tic6x | c6x*)
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
  	tx39)
  		basic_machine=mipstx39-unknown
***************
*** 921,924 ****
--- 990,997 ----
  		basic_machine=m68k-ncr
  		;;
+ 	tpf)
+ 		basic_machine=s390x-ibm
+ 		os=-tpf
+ 		;;
  	udi29k)
  		basic_machine=a29k-amd
***************
*** 942,947 ****
  		;;
  	vpp*|vx|vx-*)
!                basic_machine=f301-fujitsu
!                ;;
  	vxworks960)
  		basic_machine=i960-wrs
--- 1015,1020 ----
  		;;
  	vpp*|vx|vx-*)
! 		basic_machine=f301-fujitsu
! 		;;
  	vxworks960)
  		basic_machine=i960-wrs
***************
*** 964,972 ****
  		os=-proelf
  		;;
! 	windows32)
! 		basic_machine=i386-pc
! 		os=-windows32-msvcrt
  		;;
!         xps | xps100)
  		basic_machine=xps100-honeywell
  		;;
--- 1037,1045 ----
  		os=-proelf
  		;;
! 	xbox)
! 		basic_machine=i686-pc
! 		os=-mingw32
  		;;
! 	xps | xps100)
  		basic_machine=xps100-honeywell
  		;;
***************
*** 998,1001 ****
--- 1071,1077 ----
  		basic_machine=romp-ibm
  		;;
+ 	mmix)
+ 		basic_machine=mmix-knuth
+ 		;;
  	rs6000)
  		basic_machine=rs6000-ibm
***************
*** 1014,1018 ****
  		basic_machine=we32k-att
  		;;
! 	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
  		basic_machine=sh-unknown
  		;;
--- 1090,1094 ----
  		basic_machine=we32k-att
  		;;
! 	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
  		basic_machine=sh-unknown
  		;;
***************
*** 1020,1027 ****
  		basic_machine=sh64-unknown
  		;;
! 	sparc | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
!         cydra)
  		basic_machine=cydra-cydrome
  		;;
--- 1096,1103 ----
  		basic_machine=sh64-unknown
  		;;
! 	sparc | sparcv8 | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
! 	cydra)
  		basic_machine=cydra-cydrome
  		;;
***************
*** 1038,1045 ****
  		basic_machine=powerpc-apple
  		;;
- 	c4x*)
- 		basic_machine=c4x-none
- 		os=-coff
- 		;;
  	*-unknown)
  		# Make sure to match an already-canonicalized machine name.
--- 1114,1117 ----
***************
*** 1097,1112 ****
  	      | -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.
  		;;
--- 1169,1186 ----
  	      | -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.
  		;;
***************
*** 1120,1125 ****
  		esac
  		;;
  	-nto*)
! 		os=-nto-qnx
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--- 1194,1201 ----
  		esac
  		;;
+ 	-nto-qnx*)
+ 		;;
  	-nto*)
! 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
***************
*** 1130,1133 ****
--- 1206,1212 ----
  		os=`echo $os | sed -e 's|mac|macos|'`
  		;;
+ 	-linux-dietlibc)
+ 		os=-linux-dietlibc
+ 		;;
  	-linux*)
  		os=`echo $os | sed -e 's|linux|linux-gnu|'`
***************
*** 1142,1145 ****
--- 1221,1227 ----
  		os=-openedition
  		;;
+         -os400*)
+ 		os=-os400
+ 		;;
  	-wince*)
  		os=-wince
***************
*** 1163,1166 ****
--- 1245,1251 ----
  		os=-atheos
  		;;
+ 	-syllable*)
+ 		os=-syllable
+ 		;;
  	-386bsd)
  		os=-bsd
***************
*** 1173,1177 ****
  		;;
  	-ns2 )
! 	        os=-nextstep2
  		;;
  	-nsk*)
--- 1258,1262 ----
  		;;
  	-ns2 )
! 		os=-nextstep2
  		;;
  	-nsk*)
***************
*** 1185,1188 ****
--- 1270,1276 ----
  		os=-sysv4
  		;;
+         -tpf*)
+ 		os=-tpf
+ 		;;
  	-triton*)
  		os=-sysv3
***************
*** 1212,1217 ****
  		os=-xenix
  		;;
!         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
! 	        os=-mint
  		;;
  	-none)
--- 1300,1314 ----
  		os=-xenix
  		;;
! 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
! 		os=-mint
! 		;;
! 	-aros*)
! 		os=-aros
! 		;;
! 	-kaos*)
! 		os=-kaos
! 		;;
! 	-zvmoe)
! 		os=-zvmoe
  		;;
  	-none)
***************
*** 1246,1254 ****
  		os=-aout
  		;;
  	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
  		;;
!         pdp11-*)
  		os=-none
  		;;
--- 1343,1354 ----
  		os=-aout
  		;;
+     c4x-* | tic4x-*)
+         os=-coff
+         ;;
  	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
  		;;
! 	pdp11-*)
  		os=-none
  		;;
***************
*** 1292,1295 ****
--- 1392,1398 ----
  		os=-aix
  		;;
+     	*-knuth)
+ 		os=-mmixware
+ 		;;
  	*-wec)
  		os=-proelf
***************
*** 1343,1350 ****
  		os=-nextstep3
  		;;
!         *-gould)
  		os=-sysv
  		;;
!         *-highlevel)
  		os=-bsd
  		;;
--- 1446,1453 ----
  		os=-nextstep3
  		;;
! 	*-gould)
  		os=-sysv
  		;;
! 	*-highlevel)
  		os=-bsd
  		;;
***************
*** 1352,1359 ****
  		os=-bsd
  		;;
!         *-sgi)
  		os=-irix
  		;;
!         *-siemens)
  		os=-sysv4
  		;;
--- 1455,1462 ----
  		os=-bsd
  		;;
! 	*-sgi)
  		os=-irix
  		;;
! 	*-siemens)
  		os=-sysv4
  		;;
***************
*** 1424,1430 ****
--- 1527,1539 ----
  				vendor=ibm
  				;;
+ 			-os400*)
+ 				vendor=ibm
+ 				;;
  			-ptx*)
  				vendor=sequent
  				;;
+ 			-tpf*)
+ 				vendor=ibm
+ 				;;
  			-vxsim* | -vxworks* | -windiss*)
  				vendor=wrs