* config/tc-arm.c (md_assemble): Call mapping_state from inside a

        block in case it is a null macro.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6bbf28158897b71d91cf8b7747f0e8647af1c358..fc5e454312af598d43fcea90fd91726f13872046 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-06  Nick Clifton  <nickc@redhat.com>
+
+       * config/tc-arm.c (md_assemble): Call mapping_state from inside a
+       block in case it is a null macro.
+
 2009-08-05  Chao-ying Fu  <fu@mips.com>
 
        * config/tc-mips.c (MIPS_JALR_HINT_P): New define. For IRIX, it is

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index b843b62be7028cda21b555df9ea853270bad7db9..c77e44e4a15023125d65b93a7d68aea0f6d4008e 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -15520,7 +15520,9 @@ md_assemble (char *str)
                                arm_ext_v6t2);
 
       if (!inst.error)
-       mapping_state (MAP_THUMB);
+       {
+         mapping_state (MAP_THUMB);
+       }
     }
   else if (ARM_CPU_HAS_FEATURE (cpu_variant, arm_ext_v1))
     {
@@ -15563,7 +15565,9 @@ md_assemble (char *str)
        ARM_MERGE_FEATURE_SETS (arm_arch_used, arm_arch_used,
                                *opcode->avariant);
       if (!inst.error)
-       mapping_state (MAP_ARM);
+       {
+         mapping_state (MAP_ARM);
+       }
     }
   else
     {