summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/write.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 246c02f03a..3e7778374d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-01 Alan Modra <amodra@gmail.com>
+
+ * write.c (chain_frchains_together_1): Reorder assertion to avoid
+ uninit warning.
+
2012-09-23 Richard Sandiford <rdsandiford@googlemail.com>
* config/tc-mips.h (TC_FORCE_RELOCATION): Remove comment.
diff --git a/gas/write.c b/gas/write.c
index a4671475af..56ebb6c565 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -406,8 +406,8 @@ chain_frchains_together_1 (segT section, struct frchain *frchp)
prev_fix = frchp->fix_tail;
}
}
- gas_assert (prev_frag->fr_type != 0);
- gas_assert (prev_frag != &dummy);
+ gas_assert (prev_frag != &dummy
+ && prev_frag->fr_type != 0);
prev_frag->fr_next = 0;
return prev_frag;
}