From 2682e19f4145f725b00ab21b93a35e42d71c04da Mon Sep 17 00:00:00 2001
From: Paul Brook <pbrook@gcc.gnu.org>
Date: Thu, 29 Apr 2004 10:28:05 +0000
Subject: [PATCH] * config.gcc: Pull list of cores from arm-cores.def.

From-SVN: r81285
---
 gcc/ChangeLog  | 32 ++++++++++++++++++--------------
 gcc/config.gcc | 29 +++++++++++------------------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01c77f04dbf..58488336d3f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-29  Paul Brook  <paul@codesourcery.com>
+
+	* config.gcc: Pull list of cores from arm-cores.def.
+
 2004-04-29  Paolo Bonzini  <bonzini@gnu.org>
 
 	* combine.c (combine_simplify_rtx): Adjust call to use
@@ -23,20 +27,20 @@
 
 2004-04-29  Uros Bizjak  <uros@kss-loka.si>
 
-        * reg-stack.c (swap_to_top): New function.
-        (subst_stack_regs_pat): UNSPEC_FPATAN, UNSPEC_FYL2X: Use
-        swap_to_top().
-        (subst_stack_regs_pat): UNSPEC_FSCALE: Remove.
-        (subst_stack_regs_pat): Handle UNSPEC_FSCALE_FRACT and 
-        UNSPEC_FSCALE_EXP.
-
-        * config/i386/i386.md (UNSPEC_FSCALE): Remove.
-        (*fscale_sfxf3, *fscale_dfxf3, *fscale_xf3): Remove insn pattern.
-        (UNSPEC_FSCALE_FRACT, UNSPEC_FSCALE_EXP): New unspecs to represent
-        x87's fscale insn.
-        (*fscalexf4: Define new insn pattern to implement x87 fscale insn.
-        (exp?f2, exp10?f2, exp2?f2): Use *fscalexf4 and float_truncate
-        patterns.
+	* reg-stack.c (swap_to_top): New function.
+	(subst_stack_regs_pat): UNSPEC_FPATAN, UNSPEC_FYL2X: Use
+	swap_to_top().
+	(subst_stack_regs_pat): UNSPEC_FSCALE: Remove.
+	(subst_stack_regs_pat): Handle UNSPEC_FSCALE_FRACT and 
+	UNSPEC_FSCALE_EXP.
+
+	* config/i386/i386.md (UNSPEC_FSCALE): Remove.
+	(*fscale_sfxf3, *fscale_dfxf3, *fscale_xf3): Remove insn pattern.
+	(UNSPEC_FSCALE_FRACT, UNSPEC_FSCALE_EXP): New unspecs to represent
+	x87's fscale insn.
+	(*fscalexf4: Define new insn pattern to implement x87 fscale insn.
+	(exp?f2, exp10?f2, exp2?f2): Use *fscalexf4 and float_truncate
+	patterns.
 
 2004-04-28  Serge Belyshev  <1319@bot.ru>
 
diff --git a/gcc/config.gcc b/gcc/config.gcc
index bf980027e7d..314018ef13f 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2212,27 +2212,20 @@ fi
 	arm*-*-*)
 		supported_defaults="arch cpu float tune fpu abi"
 		for which in cpu tune; do
+			# See if it matches any of the entries in arm-cores.def
 			eval "val=\$with_$which"
-			case "$val" in
-			"" \
-			| arm[236789] | arm250 | arm[67][01]0 \
-			| arm60 | arm620 | arm7d | arm7di \
-			| arm7m | arm7dm | arm7dmi | arm[79]tdmi \
-			| arm70 | arm700i | arm710t | arm720 \
-			| arm720t | arm740t | arm710c | arm920 \
-			| arm920t | arm926ejs | arm940t | arm9e | arm10tdmi \
-			| arm7100 | arm7500 | arm7500fe | arm810 \
-			| arm1026ejs | arm1020t | arm1136js | arm1136jfs \
-			| xscale | iwmmxt \
-			| ep9312 \
-			| strongarm | strongarm110 | strongarm11[01]0)
-				# OK
-				;;
-			*)
+			[ 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
-				;;
-			esac
+			  
+			fi
 		done
 
 		case "$with_arch" in
-- 
2.30.2