* config.guess (*:FreeBSD:*:*): Refactor CPU handling.

	Canonicalize i386-*-freebsd* to i586-*-freebsd*.
Signed-off-by: Ben Elliston <bje@gnu.org>

ChangeLog

+2017-03-05  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* config.guess (*:FreeBSD:*:*): Refactor CPU handling.
+	Canonicalize i386-*-freebsd* to i586-*-freebsd*.
+
 2017-02-07  Ben Elliston  <bje@gnu.org>
 
 	Reported by Hugues Lefebvre <hugues.lefebvre@lusis.fr>.

config.guess

@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-02-07'
+timestamp='2017-03-05'
 
 # 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
@@ -837,10 +837,11 @@ EOF
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case ${UNAME_PROCESSOR} in
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
 	esac
+	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin