diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 8d4019b..9539703 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2011-06-03 Nick Clifton <nickc@redhat.com> + + PR gas/12698 + * config/tc-arm.c (parse_psr): Set m_profile to false when + assembling for any architecture. + 2011-06-02 Jie Zhang jie@codesourcery.com Nathan Sidwell nathan@codesourcery.com diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index c17a1dc..21ebdbe 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -5395,6 +5395,12 @@ parse_psr (char **str, bfd_boolean lhs) bfd_boolean is_apsr = FALSE; bfd_boolean m_profile = ARM_CPU_HAS_FEATURE (selected_cpu, arm_ext_m); + /* PR gas/12698: If the user has specified -march=all then m_profile will + be TRUE, but we want to ignore it in this case as we are building for any + CPU type, including non-m variants. */ + if (selected_cpu.core == arm_arch_any.core) + m_profile = FALSE; + /* CPSR's and SPSR's can now be lowercase. This is just a convenience feature for ease of use and backwards compatibility. */ p = *str; |