aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorAndrew Jenner <andrew@codesourcery.com>2009-12-11 17:44:24 +0000
committerAndrew Jenner <andrew@codesourcery.com>2009-12-11 17:44:24 +0000
commit2e98972ef6211756ea3aed4c172fa873557a2a09 (patch)
tree286bd053450a6a7a40fbbecc8f69ee5ac67338e5 /gas
parentf664f618421da4960487b04a2ab5e550e3a003ed (diff)
downloadgdb-2e98972ef6211756ea3aed4c172fa873557a2a09.zip
gdb-2e98972ef6211756ea3aed4c172fa873557a2a09.tar.gz
gdb-2e98972ef6211756ea3aed4c172fa873557a2a09.tar.bz2
* config/tc-arm.c (arm_init_frag): Set thumb MODE_RECORDED flag for
non-elf. (arm_handle_align): Re-enable assert for non-elf.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-arm.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index c38f445..d7cbf09 100644
--- 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 16e65d2..65d81a9 100644
--- 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. */