From b73f075a43ad13f009188e96694a3693131f9f0a Mon Sep 17 00:00:00 2001
From: Paul Brook <paul@codesourcery.com>
Date: Fri, 30 Apr 2004 20:29:23 +0000
Subject: [PATCH] config.gcc: Simplify arm --with-{cpu,tune} test.

	* config.gcc: Simplify arm --with-{cpu,tune} test.
	* config/arm/arm-cores.def: Document whitespace restrictions.

From-SVN: r81365
---
 gcc/ChangeLog                |  5 +++++
 gcc/config.gcc               | 20 +++++++++-----------
 gcc/config/arm/arm-cores.def |  4 +++-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f6a66b0a0c7..b24e85876fb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-30  Paul Brook  <paul@codesourcery.com>
+
+	* config.gcc: Simplify arm --with-{cpu,tune} test.
+	* config/arm/arm-cores.def: Document whitespace restrictions.
+
 2004-04-30  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	PR other/1963
diff --git a/gcc/config.gcc b/gcc/config.gcc
index f05d2504473..844624c0a1e 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2223,17 +2223,15 @@ fi
 		for which in cpu tune; do
 			# See if it matches any of the entries in arm-cores.def
 			eval "val=\$with_$which"
-			[ x"$val" = x ] && val=unset
-			for opt in `sed -e '/ARM_CORE/!d' \
-			  -e 's/ARM_CORE(\([^,]*\),.*$/\1/' \
-			  ${srcdir}/config/arm/arm-cores.def` unset .
-			do
-				[ x$opt = x"$val" ] && break
-			done
-			if [ $opt = . ]; then
-				echo "Unknown CPU used in --with-$which=$val" 1>&2
-				exit 1
-			  
+			if [ x"$val" = x ] \
+			    || grep "^ARM_CORE($val," \
+				    ${srcdir}/config/arm/arm-cores.def \
+				    > /dev/null; then
+			  # Ok
+			  true
+			else
+			  echo "Unknown CPU used in --with-$which=$val" 1>&2
+			  exit 1
 			fi
 		done
 
diff --git a/gcc/config/arm/arm-cores.def b/gcc/config/arm/arm-cores.def
index eeb50aa31e9..e31bc12fc22 100644
--- a/gcc/config/arm/arm-cores.def
+++ b/gcc/config/arm/arm-cores.def
@@ -31,7 +31,9 @@
    COSTS is the name of the rtx_costs routine to use.
 
    If you update this table, you must update the "tune" attribute in
-   arm.md.  */
+   arm.md.
+   
+   Some tools assume no writespace up to the first "," in each entry.  */
 
 ARM_CORE(arm2,		2,	FL_CO_PROC | FL_MODE26, slowmul)
 ARM_CORE(arm250,	2,	FL_CO_PROC | FL_MODE26, slowmul)
-- 
2.30.2