Backport from mainline.

	2011-04-18  Julian Brown  <julian@codesourcery.com>
	            Nick Clifton  <nickc@redhat.com>
	* gas/config/tc-arm.c (do_t_swi): Exclude v7 and higher variants from
	arm_ext_os test.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 596029fe78631a3f3bc42ab7aacbe44e740ae706..5b85eac377a9b0251986f2fc6f1bdd7344a72ea9 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-24  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+       Backport from mainline.
+       2011-04-18  Julian Brown  <julian@codesourcery.com>
+                   Nick Clifton  <nickc@redhat.com>
+       * config/tc-arm.c (do_t_swi): Exclude v7 and higher variants from 
+       arm_ext_os test.
+
 2011-05-29  Alan Modra  <amodra@gmail.com>
 
        Apply from mainline

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 4addafce1fff39d458a9d57d4146267ba3b7be94..1c22ad1fc672fa1f853c7e6631b57747426368f7 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -11609,7 +11609,9 @@ do_t_swi (void)
      to ARM_EXT_V6M.  */
   if (ARM_CPU_HAS_FEATURE (cpu_variant, arm_ext_v6m))
     {
-      if (!ARM_CPU_HAS_FEATURE (cpu_variant, arm_ext_os))
+      if (!ARM_CPU_HAS_FEATURE (cpu_variant, arm_ext_os)
+         /* This only applies to the v6m howver, not later architectures.  */
+         && ! ARM_CPU_HAS_FEATURE (cpu_variant, arm_ext_v7))
        as_bad (_("SVC is not permitted on this architecture"));
       ARM_MERGE_FEATURE_SETS (thumb_arch_used, thumb_arch_used, arm_ext_os);
     }