From 2e98972ef6211756ea3aed4c172fa873557a2a09 Mon Sep 17 00:00:00 2001 From: Andrew Jenner Date: Fri, 11 Dec 2009 17:44:24 +0000 Subject: [PATCH] * config/tc-arm.c (arm_init_frag): Set thumb MODE_RECORDED flag for non-elf. (arm_handle_align): Re-enable assert for non-elf. --- gas/ChangeLog | 6 ++++++ gas/config/tc-arm.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index c38f445f069..d7cbf09ad71 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2009-12-11 Andrew Jenner + + * 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 * Makefile.in: Regenerate. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 16e65d21375..65d81a9b45d 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. */ -- 2.30.2