From: Terry Guo <terry.guo@arm.com>
Date: Mon, 6 Jan 2014 08:16:30 +0000 (+0000)
Subject: config.gcc (arm*-*-*): Check --with-arch against arm-arches.def.
X-Git-Tag: misc/gupc_5_2_0_release~108^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7d19c0b588cc00957d7e40d75d336c41e73fbb3;p=thirdparty%2Fgcc.git

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 1969671af12a..33548a07100b 100644
--- 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 bd0fb6359604..23657a5b0f42 100644
--- 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
 		"" \