From 4fc0b46e62cec696390862c9eb7d80b35d24f0f8 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 1 Oct 2012 06:46:16 +0000 Subject: [PATCH] * write.c (chain_frchains_together_1): Reorder assertion to avoid uninit warning. --- gas/ChangeLog | 5 +++++ gas/write.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 246c02f03a4..3e7778374df 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2012-10-01 Alan Modra + + * write.c (chain_frchains_together_1): Reorder assertion to avoid + uninit warning. + 2012-09-23 Richard Sandiford * config/tc-mips.h (TC_FORCE_RELOCATION): Remove comment. diff --git a/gas/write.c b/gas/write.c index a4671475af6..56ebb6c565b 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; } -- 2.30.2