Make the gcc config.guess exec the toplevel config.guess.

Make the gcc config.guess exec the toplevel config.guess.  Update the toplevel
config.guess from the gcc config.guess.

From-SVN: r14976

ChangeLog

+Wed Aug 27 16:15:11 1997  Jim Wilson  <wilson@cygnus.com>
+
+	* config.guess: Update from gcc directory.
+
 Wed Aug 20 19:57:37 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* Makefile.in (BISON, YACC): Use $$s.

config.guess

@@ -157,6 +157,18 @@ EOF
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	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
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
@@ -494,6 +506,7 @@ EOF
 		ret \$31,(\$26),1
 		.end main
 EOF
+		LIBC=""
 		${CC-cc} dummy.s -o dummy 2>/dev/null
 		if test "$?" = 0 ; then
 			./dummy
@@ -504,10 +517,16 @@ EOF
 			2)	
 					UNAME_MACHINE="alphaev56"
 				;;	
-		esac	
-	  fi	
-	  rm -f dummy.s dummy
-	  echo ${UNAME_MACHINE}-unknown-linux-gnu ; exit 0
+			esac	
+
+			objdump --private-headers dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi	
+		rm -f dummy.s dummy
+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
 	elif test "${UNAME_MACHINE}" = "mips" ; then
 	  cat >dummy.c <<EOF
 main(argc, argv)

gcc/ChangeLog

 Wed Aug 27 16:08:43 1997  Jim Wilson  <wilson@cygnus.com>
 
+	* config.guess: Replace with script that uses ../config.guess.
+
 	* config/alpha/elf.h (DEFAULT_VTABLE_THUNKS): New. Defined as 1
 	if USE_GNULIBC_1 is not defined.