* config/tc-arm.c (arm_init_frag): Set thumb MODE_RECORDED flag for

       non-elf.
       (arm_handle_align): Re-enable assert for non-elf.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c38f445f06968ea01f8afd95dc0d8a2943d4eba6..d7cbf09ad718342a2b11b64510fbbaa3894e4419 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-11  Andrew Jenner  <andrew@codesourcery.com>
+
+       * config/tc-arm.c (arm_init_frag): Set thumb MODE_RECORDED flag for
+       non-elf.
+       (arm_handle_align): Re-enable assert for non-elf.
+
 2009-12-11  Nick Clifton  <nickc@redhat.com>
 
        * Makefile.in: Regenerate.

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 16e65d21375be00ca96599d358027334bbea2269..65d81a9b45d789ef34b2bfeb188eff273ee24f68 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -18577,9 +18577,7 @@ arm_handle_align (fragS * fragP)
   if (bytes > MAX_MEM_FOR_RS_ALIGN_CODE)
     bytes &= MAX_MEM_FOR_RS_ALIGN_CODE;
 
-#ifdef OBJ_ELF
   gas_assert ((fragP->tc_frag_data.thumb_mode & MODE_RECORDED) != 0);
-#endif
 
   if (fragP->tc_frag_data.thumb_mode & (~ MODE_RECORDED))
     {
@@ -18685,7 +18683,7 @@ void
 arm_init_frag (fragS * fragP, int max_chars ATTRIBUTE_UNUSED)
 {
   /* Record whether this frag is in an ARM or a THUMB area.  */
-  fragP->tc_frag_data.thumb_mode = thumb_mode;
+  fragP->tc_frag_data.thumb_mode = thumb_mode | MODE_RECORDED;
 }
 
 #else /* OBJ_ELF is defined.  */