From 1edc28e37431f4044a542886c557d658cbca5323 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Sat, 2 Dec 2000 04:44:22 +0000
Subject: [PATCH] 2000-12-02  Ben Elliston  <bje@redhat.com>

	* config.guess: Only append "elf" to "netbsd" for platforms that
	have switched to the ELF object file format in recent history.
	From Matthew Green <mrg@eterna.com.au>.
---
 ChangeLog    |  6 ++++++
 config.guess | 30 +++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a59ffc1..ba073f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-02  Ben Elliston  <bje@redhat.com>
+
+	* config.guess: Only append "elf" to "netbsd" for platforms that
+	have switched to the ELF object file format in recent history.
+	From Matthew Green <mrg@eterna.com.au>.
+
 2000-11-24  Nick Clifton  <nickc@redhat.com>
 
 	* config.sub: Add xscale as a recognised CPU name.
diff --git a/config.guess b/config.guess
index 8f06065..3b0cc04 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 
-timestamp='2000-11-23'
+timestamp='2000-12-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -141,16 +141,24 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    ibmrt|romp-ibm) machine=romp-ibm ;;
 	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
-	# The Operating System including object format.
-	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep __ELF__ >/dev/null
-	then
-	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-	    # Return netbsd for either.  FIX?
-	    os=netbsd
-	else
-	    os=netbsdelf
-	fi
+	# 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)
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep __ELF__ >/dev/null
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
 	# The OS release
 	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: