diff options
| author | Matthew Gretton-Dann <matthew.gretton-dann@arm.com> | 2011-08-24 12:43:07 +0000 |
|---|---|---|
| committer | Matthew Gretton-Dann <matthew.gretton-dann@arm.com> | 2011-08-24 12:43:07 +0000 |
| commit | 1d22e0731c9d33ccd2d8e7a54c3361d176347a65 (patch) | |
| tree | 66721af945ea585c73de3c800f50d06adc3ca8b3 | |
| parent | 159838664f0a038494274975d1db4e15866b7f4a (diff) | |
| download | fsf-binutils-gdb-1d22e0731c9d33ccd2d8e7a54c3361d176347a65.zip fsf-binutils-gdb-1d22e0731c9d33ccd2d8e7a54c3361d176347a65.tar.gz fsf-binutils-gdb-1d22e0731c9d33ccd2d8e7a54c3361d176347a65.tar.bz2 | |
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.
| -rw-r--r-- | gas/ChangeLog | 8 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 596029f..5b85eac 100644 --- 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 4addafc..1c22ad1 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); } |