aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2004-04-30 20:29:23 +0000
committerPaul Brook <pbrook@gcc.gnu.org>2004-04-30 20:29:23 +0000
commitb73f075a43ad13f009188e96694a3693131f9f0a (patch)
tree4986411047b9a9c6330be11c24894f336ef31e34 /gcc
parent5076da17d212acc01b53d287b93d482f55eef337 (diff)
downloadgcc-b73f075a43ad13f009188e96694a3693131f9f0a.zip
gcc-b73f075a43ad13f009188e96694a3693131f9f0a.tar.gz
gcc-b73f075a43ad13f009188e96694a3693131f9f0a.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config.gcc20
-rw-r--r--gcc/config/arm/arm-cores.def4
3 files changed, 17 insertions, 12 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f6a66b0..b24e858 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 f05d250..844624c 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 eeb50aa..e31bc12 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)