PR gas/12698

	* config/tc-arm.c (parse_psr): Set m_profile to false when
	assembling for any architecture.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8d4019be9cdb11f500d80be226b613218b06ba63..95397032836ae71403688a272ee997add79555e6 100644 (file)
--- 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 c17a1dcb5432c7f5ff9794e4c5d86de0d42920d0..21ebdbe7a7b7ec9d476a22f640199ee9388b9914 100644 (file)
--- 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;