From 083292684fdcb12e7859e4c81d7ec7ad6901c146 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Wed, 12 Dec 2001 10:41:46 +0000
Subject: [PATCH] 2001-12-12  Ben Elliston  <bje@redhat.com>

	* config.guess (i*86:Linux:*:*): Minor simplification: have the
	preprocessor emit shell assignments and just eval the output.

2001-12-12  H.J. Lu  <hjl@gnu.org>

	* config.guess (mips:Linux:*:*): Re-work.
---
 ChangeLog    | 15 ++++++++++++---
 config.guess | 30 +++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4bf4eac..3210e1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
 2001-12-12  Ben Elliston  <bje@redhat.com>
 
-	* config.guess: Speed up detection of x86 Linux systems by using
-	just the C preprocessor rather than assembling and linking a final
-	executable.
+	* config.guess (i*86:Linux:*:*): Minor simplification: have the
+	preprocessor emit shell assignments and just eval the output.
+
+2001-12-12  H.J. Lu  <hjl@gnu.org>
+
+	* config.guess (mips:Linux:*:*): Re-work.
+
+2001-12-12  Ben Elliston  <bje@redhat.com>
+
+	* config.guess (i*86:Linux:*:*): Speed up detection of x86 Linux
+	systems by using just the C preprocessor rather than assembling
+	and linking a final executable.
 
 2001-12-12  Jason Thorpe  <thorpej@wasabisystems.com>
 
diff --git a/config.guess b/config.guess
index c299504..7a7edfe 100755
--- a/config.guess
+++ b/config.guess
@@ -765,10 +765,21 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	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
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#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:*:*)
 	echo powerpc-unknown-linux-gnu
@@ -846,19 +857,20 @@ EOF
 	#ifdef __ELF__
 	# ifdef __GLIBC__
 	#  if __GLIBC__ >= 2
-	gnu
+	LIBC=gnu
 	#  else
-	gnulibc1
+	LIBC=gnulibc1
 	#  endif
 	# else
-	gnulibc1
+	LIBC=gnulibc1
 	# endif
 	#else
-	gnuaout
+	LIBC=gnuaout
 	#endif
 EOF
-	libc=`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^gnu` && test -n $libc && rm -f $dummy.c && echo "${UNAME_MACHINE}-pc-linux-$libc" && exit 0
+	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
 	;;
     i*86:DYNIX/ptx:4*:*)