* write.c (chain_frchains_together_1): Reorder assertion to avoid

	uninit warning.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 246c02f03a4bf6a6049bf8f1b193171048e66c9e..3e7778374dfc1ef1697769441da8ff48124f0795 100644 (file)
--- 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 a4671475af608ea281caccf8832799caef5c13f7..56ebb6c565bea35df43565b53206156270a41b66 100644 (file)
--- 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;
 }