This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Committed: fix recent MMIX gas regression
- From: Hans-Peter Nilsson <hp at bitrange dot com>
- To: binutils at sourceware dot org
- Date: Tue, 17 Jun 2014 18:17:07 -0400 (EDT)
- Subject: Committed: fix recent MMIX gas regression
- Authentication-results: sourceware.org; auth=none
Here's the fix for MMIX to get rid of the follow-on misleading
"attempt to move .org backwards". Committed.
gas:
* config/tc-mmix.c (loc_assert_s): New member frag.
(s_loc): Set it.
(mmix_md_end): If an error is reported for a LOC expression, patch
up the related frag.
diff --git a/gas/config/tc-mmix.c b/gas/config/tc-mmix.c
index ab0fd00..7740ee2 100644
--- a/gas/config/tc-mmix.c
+++ b/gas/config/tc-mmix.c
@@ -112,6 +112,7 @@ static struct loc_assert_s
{
segT old_seg;
symbolS *loc_sym;
+ fragS *frag;
struct loc_assert_s *next;
} *loc_asserts = NULL;
@@ -3560,6 +3561,15 @@ mmix_md_end (void)
as_bad_where (fnam, line,
_("LOC to section unknown or indeterminable "
"at first pass"));
+
+ /* Patch up the generic location data to avoid cascading
+ error messages from later passes. (See original in
+ write.c:relax_segment.) */
+ fragP = loc_assert->frag;
+ fragP->fr_type = rs_align;
+ fragP->fr_subtype = 0;
+ fragP->fr_offset = 0;
+ fragP->fr_fix = 0;
}
}
@@ -4084,6 +4094,7 @@ s_loc (int ignore ATTRIBUTE_UNUSED)
loc_asserts->next = next;
loc_asserts->old_seg = now_seg;
loc_asserts->loc_sym = esym;
+ loc_asserts->frag = frag_now;
}
p = frag_var (rs_org, 1, 1, (relax_substateT) 0, sym, off, (char *) 0);
brgds, H-P