From: Nick Clifton <nickc@redhat.com>
Date: Thu, 6 Aug 2009 10:10:50 +0000 (+0000)
Subject:         * config/tc-arm.c (md_assemble): Call mapping_state from inside a
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c877a2f27774baf9fd59b3eb0ebdddb061b42c2f;p=binutils-gdb.git

    * 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 6bbf2815889..fc5e454312a 100644
--- 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 b843b62be70..c77e44e4a15 100644
--- 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
     {