From 1d22e0731c9d33ccd2d8e7a54c3361d176347a65 Mon Sep 17 00:00:00 2001 From: Matthew Gretton-Dann Date: Wed, 24 Aug 2011 12:43:07 +0000 Subject: [PATCH] Backport from mainline. 2011-04-18 Julian Brown Nick Clifton * gas/config/tc-arm.c (do_t_swi): Exclude v7 and higher variants from arm_ext_os test. --- gas/ChangeLog | 8 ++++++++ gas/config/tc-arm.c | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 596029fe786..5b85eac377a 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2011-08-24 Matthew Gretton-Dann + + Backport from mainline. + 2011-04-18 Julian Brown + Nick Clifton + * config/tc-arm.c (do_t_swi): Exclude v7 and higher variants from + arm_ext_os test. + 2011-05-29 Alan Modra Apply from mainline diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 4addafce1ff..1c22ad1fc67 100644 --- 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); } -- 2.47.2