config.gcc (arm*-*-*): Check --with-arch against arm-arches.def.

2014-01-06  Terry Guo  <terry.guo@arm.com>

	* config.gcc (arm*-*-*): Check --with-arch against arm-arches.def.

From-SVN: r206354

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1969671af12a614c498e8bb6ca1de52ce8946d57..33548a07100b0c27bcc19d9e619c85d7995f06bf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-06  Terry Guo  <terry.guo@arm.com>
+
+       * config.gcc (arm*-*-*): Check --with-arch against arm-arches.def.
+
 2014-01-05  Iain Sandoe  <iain@codesourcery.com>
 
        PR bootstrap/59541

diff --git a/gcc/config.gcc b/gcc/config.gcc
index bd0fb6359604bd2f7ad34f256949bb351e105d41..23657a5b0f42f5d20f3815ca49003c534d99a4e2 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -3476,19 +3476,17 @@ case "${target}" in
                        fi
                done
 
-               case "$with_arch" in
-               "" \
-               | armv[23456] | armv2a | armv3m | armv4t | armv5t \
-               | armv5te | armv6j |armv6k | armv6z | armv6zk | armv6-m \
-               | armv7 | armv7-a | armv7-r | armv7-m | armv8-a \
-               | iwmmxt | ep9312)
-                       # OK
-                       ;;
-               *)
-                       echo "Unknown arch used in --with-arch=$with_arch" 1>&2
-                       exit 1
-                       ;;
-               esac
+               # See if it matches any of the entries in arm-arches.def
+               if [ x"$with_arch" = x ] \
+                   || grep "^ARM_ARCH(\"$with_arch\"," \
+                           ${srcdir}/config/arm/arm-arches.def \
+                           > /dev/null; then
+                 # OK
+                 true
+               else
+                 echo "Unknown arch used in --with-arch=$with_arch" 1>&2
+                 exit 1
+               fi
 
                case "$with_float" in
                "" \