From ace8c17897c94fd88ed54ee715252f94375d1a13 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Tue, 2 Jun 2009 10:28:06 +1000
Subject: [PATCH] 	* config.guess: Factor mips:Linux:*:* and
 mips64:Linux:*:*.

---
 ChangeLog    |  4 ++++
 config.guess | 33 +++++----------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b45388b..f451eeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-02  Ben Elliston  <bje@gnu.org>
+
+	* config.guess: Factor mips:Linux:*:* and mips64:Linux:*:*.
+
 2009-06-02  Ben Elliston  <bje@gnu.org>
 
 	* config.guess: Drop detection for i386-pc-linux-gnuaout on
diff --git a/config.guess b/config.guess
index 9d937e7..17d2f09 100755
--- a/config.guess
+++ b/config.guess
@@ -885,40 +885,17 @@ EOF
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#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 | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    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
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif