CVS: beepcore-c config.guess,1.1,1.2

Chris Hanson <[email protected]> Thu, 01 Aug 2002 19:09:23 -0700
Newsgroups gmane.network.beep.beepcore.c.cvs
Message-ID <[email protected]>
Update of /cvsroot/beepcore-c/beepcore-c
In directory usw-pr-cvs1:/tmp/cvs-serv6939

Modified Files:
	config.guess 
Log Message:
Update config.{guess,sub} to recent versions.


Index: config.guess
===================================================================
RCS file: /cvsroot/beepcore-c/beepcore-c/config.guess,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.guess	28 Aug 2001 05:39:40 -0000	1.1
--- config.guess	2 Aug 2002 02:09:21 -0000	1.2
***************
*** 1,8 ****
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! #   Free Software Foundation, Inc.
  
! timestamp='2001-07-19'
  
  # This file is free software; you can redistribute it and/or modify it
--- 1,8 ----
  #! /bin/sh
  # 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
***************
*** 25,30 ****
  # the same distribution terms that you use for the rest of that program.
  
! # Written by Per Bothner <[email protected]>.
! # Please send patches to <[email protected]>.
  #
  # This script attempts to guess a canonical system name similar to
--- 25,31 ----
  # the same distribution terms that you use for the rest of that program.
  
! # Originally written by Per Bothner <[email protected]>.
! # Please send patches to <[email protected]>.  Submit a context
! # diff and a properly formatted ChangeLog entry.
  #
  # This script attempts to guess a canonical system name similar to
***************
*** 98,102 ****
  set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
   ,,)    echo "int dummy(){}" > $dummy.c ;
! 	for c in cc gcc c89 ; do
  	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
  	  if test $? = 0 ; then
--- 99,103 ----
  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
***************
*** 128,132 ****
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      *:NetBSD:*:*)
! 	# Netbsd (nbsd) targets should (where applicable) match one or
  	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
  	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
--- 129,133 ----
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      *:NetBSD:*:*)
! 	# NetBSD (nbsd) targets should (where applicable) match one or
  	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
  	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
***************
*** 135,154 ****
  	# compatibility and a consistent mechanism for selecting the
  	# object file format.
! 	# Determine the machine/vendor (is the vendor relevant).
! 	case "${UNAME_MACHINE}" in
! 	    amiga) machine=m68k-unknown ;;
! 	    arm32) machine=arm-unknown ;;
! 	    atari*) machine=m68k-atari ;;
! 	    sun3*) machine=m68k-sun ;;
! 	    mac68k) machine=m68k-apple ;;
! 	    macppc) machine=powerpc-apple ;;
! 	    hp3[0-9][05]) machine=m68k-hp ;;
! 	    ibmrt|romp-ibm) machine=romp-ibm ;;
! 	    *) machine=${UNAME_MACHINE}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
  	# to ELF recently, or will in the future.
! 	case "${UNAME_MACHINE}" in
! 	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--- 136,156 ----
  	# compatibility and a consistent mechanism for selecting the
  	# object file format.
! 	#
! 	# Note: NetBSD doesn't particularly care about the vendor
! 	# portion of the name.  We always set it to "unknown".
! 	sysctl="sysctl -n hw.machine_arch"
! 	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
! 	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
! 	case "${UNAME_MACHINE_ARCH}" in
! 	    armeb) machine=armeb-unknown ;;
! 	    arm*) machine=arm-unknown ;;
! 	    sh3el) machine=shl-unknown ;;
! 	    sh3eb) machine=sh-unknown ;;
! 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
  	# to ELF recently, or will in the future.
! 	case "${UNAME_MACHINE_ARCH}" in
! 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
***************
*** 173,176 ****
--- 175,217 ----
  	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}
+ 	exit 0 ;;
+     macppc:OpenBSD:*:*)
+ 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvme68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvme88k:OpenBSD:*:*)
+ 	echo m88k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvmeppc:OpenBSD:*:*)
+ 	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
***************
*** 228,231 ****
--- 269,275 ----
  				UNAME_MACHINE="alphaev67"
  				;;
+ 			2-1307)
+ 				UNAME_MACHINE="alphaev68"
+ 				;;
  		esac
  	fi
***************
*** 245,271 ****
  	echo m68k-unknown-sysv4
  	exit 0;;
-     amiga:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
      *:[Aa]miga[Oo][Ss]:*:*)
  	echo ${UNAME_MACHINE}-unknown-amigaos
  	exit 0 ;;
!     arc64:OpenBSD:*:*)
! 	echo mips64el-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     arc:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     hkmips:OpenBSD:*:*)
! 	echo mips-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     pmax:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     sgi:OpenBSD:*:*)
! 	echo mips-unknown-openbsd${UNAME_RELEASE}
! 	exit 0 ;;
!     wgrisc:OpenBSD:*:*)
! 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  	exit 0 ;;
      *:OS/390:*:*)
--- 289,297 ----
  	echo m68k-unknown-sysv4
  	exit 0;;
      *:[Aa]miga[Oo][Ss]:*:*)
  	echo ${UNAME_MACHINE}-unknown-amigaos
  	exit 0 ;;
!     *:[Mm]orph[Oo][Ss]:*:*)
! 	echo ${UNAME_MACHINE}-unknown-morphos
  	exit 0 ;;
      *:OS/390:*:*)
***************
*** 317,321 ****
  	exit 0 ;;
      sun*:*:4.2BSD:*)
! 	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
  	case "`/bin/arch`" in
--- 343,347 ----
  	exit 0 ;;
      sun*:*:4.2BSD:*)
! 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
  	case "`/bin/arch`" in
***************
*** 331,337 ****
  	echo sparc-auspex-sunos${UNAME_RELEASE}
  	exit 0 ;;
-     atari*:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
--- 357,360 ----
***************
*** 360,375 ****
          echo m68k-unknown-mint${UNAME_RELEASE}
          exit 0 ;;
-     sun3*:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     mac68k:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     mvme68k:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     mvme88k:OpenBSD:*:*)
- 	echo m88k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
      powerpc:machten:*:*)
  	echo powerpc-apple-machten${UNAME_RELEASE}
--- 383,386 ----
***************
*** 388,391 ****
--- 399,403 ----
  	exit 0 ;;
      mips:*:*:UMIPS | mips:*:*:RISCos)
+ 	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
  #ifdef __cplusplus
***************
*** 409,413 ****
  	}
  EOF
- 	eval $set_cc_for_build
  	$CC_FOR_BUILD $dummy.c -o $dummy \
  	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--- 421,424 ----
***************
*** 419,422 ****
--- 430,436 ----
  	echo powerpc-motorola-powermax
  	exit 0 ;;
+     Night_Hawk:*:*:PowerMAX_OS)
+ 	echo powerpc-harris-powermax
+ 	exit 0 ;;
      Night_Hawk:Power_UNIX:*:*)
  	echo powerpc-harris-powerunix
***************
*** 479,482 ****
--- 493,497 ----
      *:AIX:2:3)
  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		eval $set_cc_for_build
  		sed 's/^		//' << EOF >$dummy.c
  		#include <sys/systemcfg.h>
***************
*** 490,494 ****
  			}
  EOF
- 		eval $set_cc_for_build
  		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
  		rm -f $dummy.c $dummy
--- 505,508 ----
***************
*** 501,505 ****
  	exit 0 ;;
      *:AIX:*:[45])
! 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
--- 515,519 ----
  	exit 0 ;;
      *:AIX:*:[45])
! 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
***************
*** 541,548 ****
  	    9000/[34]?? )         HP_ARCH=m68k ;;
  	    9000/[678][0-9][0-9])
!               case "${HPUX_REV}" in
!                 11.[0-9][0-9])
!                   if [ -x /usr/bin/getconf ]; then
!                     sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                      sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                      case "${sc_cpu_version}" in
--- 555,560 ----
  	    9000/[34]?? )         HP_ARCH=m68k ;;
  	    9000/[678][0-9][0-9])
! 		if [ -x /usr/bin/getconf ]; then
! 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                      sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                      case "${sc_cpu_version}" in
***************
*** 553,562 ****
                            32) HP_ARCH="hppa2.0n" ;;
                            64) HP_ARCH="hppa2.0w" ;;
                          esac ;;
                      esac
!                   fi ;;
!               esac
!               if [ "${HP_ARCH}" = "" ]; then
!               sed 's/^              //' << EOF >$dummy.c
  
                #define _HPUX_SOURCE
--- 565,575 ----
                            32) HP_ARCH="hppa2.0n" ;;
                            64) HP_ARCH="hppa2.0w" ;;
+ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                          esac ;;
                      esac
! 		fi
! 		if [ "${HP_ARCH}" = "" ]; then
! 		    eval $set_cc_for_build
! 		    sed 's/^              //' << EOF >$dummy.c
  
                #define _HPUX_SOURCE
***************
*** 591,599 ****
                }
  EOF
! 	eval $set_cc_for_build
! 	(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}
--- 604,611 ----
                }
  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}
***************
*** 604,607 ****
--- 616,620 ----
  	exit 0 ;;
      3050*:HI-UX:*:*)
+ 	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
  	#include <unistd.h>
***************
*** 629,633 ****
  	}
  EOF
- 	eval $set_cc_for_build
  	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
  	rm -f $dummy.c $dummy
--- 642,645 ----
***************
*** 659,665 ****
  	echo hppa1.1-hp-lites
  	exit 0 ;;
-     hppa*:OpenBSD:*:*)
- 	echo hppa-unknown-openbsd
- 	exit 0 ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
--- 671,674 ----
***************
*** 680,686 ****
  	echo c4-convex-bsd
          exit 0 ;;
-     CRAY*X-MP:*:*:*)
- 	echo xmp-cray-unicos
-         exit 0 ;;
      CRAY*Y-MP:*:*:*)
  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--- 689,692 ----
***************
*** 704,710 ****
  	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
-     CRAY-2:*:*:*)
- 	echo cray2-cray-unicos
-         exit 0 ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--- 710,713 ----
***************
*** 713,719 ****
          echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
          exit 0 ;;
-     hp300:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--- 716,719 ----
***************
*** 728,734 ****
  	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  	exit 0 ;;
-     *:OpenBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- 	exit 0 ;;
      i*:CYGWIN*:*)
  	echo ${UNAME_MACHINE}-pc-cygwin
--- 728,731 ----
***************
*** 740,743 ****
--- 737,743 ----
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit 0 ;;
+     x86:Interix*:3*)
+ 	echo i386-pc-interix3
+ 	exit 0 ;;
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
***************
*** 765,769 ****
  	exit 0 ;;
      ia64:Linux:*:*)
! 	echo ${UNAME_MACHINE}-unknown-linux
  	exit 0 ;;
      m68*:Linux:*:*)
--- 765,769 ----
  	exit 0 ;;
      ia64:Linux:*:*)
! 	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit 0 ;;
      m68*:Linux:*:*)
***************
*** 771,778 ****
  	exit 0 ;;
      mips:Linux:*:*)
! 	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
! 	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
! 	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
! 	esac
  	;;
      ppc:Linux:*:*)
--- 771,792 ----
  	exit 0 ;;
      mips:Linux:*:*)
! 	eval $set_cc_for_build
! 	sed 's/^	//' << EOF >$dummy.c
! 	#undef CPU
! 	#undef mips
! 	#undef mipsel
! 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
! 	CPU=mipsel
! 	#else
! 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
! 	CPU=mips
! 	#else
! 	CPU=
! 	#endif
! 	#endif
! 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:*:*)
***************
*** 790,794 ****
  	  EV6)   UNAME_MACHINE=alphaev6 ;;
  	  EV67)  UNAME_MACHINE=alphaev67 ;;
! 	  EV68*) UNAME_MACHINE=alphaev67 ;;
          esac
  	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--- 804,808 ----
  	  EV6)   UNAME_MACHINE=alphaev6 ;;
  	  EV67)  UNAME_MACHINE=alphaev67 ;;
! 	  EV68*) UNAME_MACHINE=alphaev68 ;;
          esac
  	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
***************
*** 823,827 ****
  	# first see if it will tell us. cd to the root directory to prevent
  	# problems with other programs or directories called `ld' in the path.
! 	ld_supported_targets=`cd /; ld --help 2>&1 \
  			 | sed -ne '/supported targets:/!d
  				    s/[ 	][ 	]*/ /g
--- 837,842 ----
  	# first see if it will tell us. cd to the root directory to prevent
  	# problems with other programs or directories called `ld' in the path.
! 	# Set LC_ALL=C to ensure ld outputs messages in English.
! 	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
  			 | sed -ne '/supported targets:/!d
  				    s/[ 	][ 	]*/ /g
***************
*** 846,876 ****
  	esac
  	# Determine whether the default compiler is a.out or elf
- 	cat >$dummy.c <<EOF
- #include <features.h>
- #ifdef __cplusplus
- #include <stdio.h>  /* for printf() prototype */
- 	int main (int argc, char *argv[]) {
- #else
- 	int main (argc, argv) int argc; char *argv[]; {
- #endif
- #ifdef __ELF__
- # ifdef __GLIBC__
- #  if __GLIBC__ >= 2
-     printf ("%s-pc-linux-gnu\n", argv[1]);
- #  else
-     printf ("%s-pc-linux-gnulibc1\n", argv[1]);
- #  endif
- # else
-    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
- # endif
- #else
-   printf ("%s-pc-linux-gnuaout\n", argv[1]);
- #endif
-   return 0;
- }
- EOF
  	eval $set_cc_for_build
! 	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
! 	rm -f $dummy.c $dummy
  	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
  	;;
--- 861,888 ----
  	esac
  	# Determine whether the default compiler is a.out or elf
  	eval $set_cc_for_build
! 	sed 's/^	//' << EOF >$dummy.c
! 	#include <features.h>
! 	#ifdef __ELF__
! 	# ifdef __GLIBC__
! 	#  if __GLIBC__ >= 2
! 	LIBC=gnu
! 	#  else
! 	LIBC=gnulibc1
! 	#  endif
! 	# else
! 	LIBC=gnulibc1
! 	# endif
! 	#else
! 	#ifdef __INTEL_COMPILER
! 	LIBC=gnu
! 	#else
! 	LIBC=gnuaout
! 	#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
  	;;
***************
*** 910,920 ****
  		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
  	elif /bin/uname -X 2>/dev/null >/dev/null ; then
! 		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.*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
--- 922,932 ----
  		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
  	elif /bin/uname -X 2>/dev/null >/dev/null ; then
! 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
! 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
! 		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
  			&& UNAME_MACHINE=i586
! 		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
  			&& UNAME_MACHINE=i686
! 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
  			&& UNAME_MACHINE=i686
  		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
***************
*** 951,955 ****
      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 | 4850:*:4.0:3.0)
  	OS_REL=''
  	test -r /etc/.relid \
--- 963,967 ----
      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 \
***************
*** 997,1002 ****
  	fi
  	exit 0 ;;
!     PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
!                            # says <[email protected]>
          echo i586-unisys-sysv4
          exit 0 ;;
--- 1009,1014 ----
  	fi
  	exit 0 ;;
!     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
!                       # says <[email protected]>
          echo i586-unisys-sysv4
          exit 0 ;;
***************
*** 1010,1013 ****
--- 1022,1029 ----
  	echo i860-stratus-sysv4
  	exit 0 ;;
+     *:VOS:*:*)
+ 	# From [email protected].
+ 	echo hppa1.1-stratus-vos
+ 	exit 0 ;;
      mc68*:A/UX:*:*)
  	echo m68k-apple-aux${UNAME_RELEASE}
***************
*** 1048,1060 ****
  	exit 0 ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
! 	if test "${UNAME_MACHINE}" = "x86pc"; then
  		UNAME_MACHINE=pc
  	fi
! 	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
  	exit 0 ;;
      *:QNX:*:4*)
  	echo i386-pc-qnx
  	exit 0 ;;
!     NSR-[KW]:NONSTOP_KERNEL:*:*)
  	echo nsr-tandem-nsk${UNAME_RELEASE}
  	exit 0 ;;
--- 1064,1078 ----
  	exit 0 ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
! 	UNAME_PROCESSOR=`uname -p`
! 	if test "$UNAME_PROCESSOR" = "x86"; then
! 		UNAME_PROCESSOR=i386
  		UNAME_MACHINE=pc
  	fi
! 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
  	exit 0 ;;
      *:QNX:*:4*)
  	echo i386-pc-qnx
  	exit 0 ;;
!     NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
  	echo nsr-tandem-nsk${UNAME_RELEASE}
  	exit 0 ;;
***************
*** 1102,1105 ****
--- 1120,1129 ----
  	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
  
***************
*** 1107,1110 ****
--- 1131,1135 ----
  #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
  
+ eval $set_cc_for_build
  cat >$dummy.c <<EOF
  #ifdef _SEQUENT_
***************
*** 1221,1225 ****
  EOF
  
- eval $set_cc_for_build
  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
  rm -f $dummy.c $dummy
--- 1246,1249 ----



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf