Fix various warnings seen when using gcc-5.0

	* config/tc-m68k.c (md_assemble): Add assert to work around
	bogus trunk gcc warning.
	* config/tc-pj.h (md_convert_frag): Warning fix.
	* config/tc-xtensa.c (xg_assemble_vliw_tokens): Warning fix.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a01b41e1cdfb7a1be0156f3fb8c52baa9e5f2f88..9d512b6961a07a5454d0f8067fce87a33c644398 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2014-09-22  Alan Modra  <amodra@gmail.com>
+
+       * config/tc-m68k.c (md_assemble): Add assert to work around
+       bogus trunk gcc warning.
+       * config/tc-pj.h (md_convert_frag): Warning fix.
+       * config/tc-xtensa.c (xg_assemble_vliw_tokens): Warning fix.
+
 2014-09-17  Tristan Gingold  <gingold@adacore.com>
 
        * config/tc-arm.c (move_or_literal_pool, add_to_lit_pool): Use

diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 56db0832337edb5d3fe024b717788c426a379950..7fc4efeb7baafdb22b70454934971b0129347a7c 100644 (file)
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -4511,7 +4511,8 @@ md_assemble (char *str)
                       (relax_substateT) (the_ins.fragb[n].fragty),
                       the_ins.fragb[n].fadd, the_ins.fragb[n].foff, to_beg_P);
     }
-  n = (the_ins.numo - the_ins.fragb[n - 1].fragoff);
+  gas_assert (the_ins.nfrag >= 1);
+  n = the_ins.numo - the_ins.fragb[the_ins.nfrag - 1].fragoff;
   shorts_this_frag = 0;
   if (n)
     {

diff --git a/gas/config/tc-pj.h b/gas/config/tc-pj.h
index eda1792fb64050ff96de413dded79990271b32e8..61cd11f95e73d7d78dc8854f6e4bb6c5e6275d84 100644 (file)
--- a/gas/config/tc-pj.h
+++ b/gas/config/tc-pj.h
@@ -36,7 +36,7 @@ void pj_cons_fix_new_pj (struct frag *, int, int, expressionS *,
 arelent *tc_gen_reloc (asection *, struct fix *);
 
 #define md_section_align(SEGMENT, SIZE)     (SIZE)
-#define md_convert_frag(B, S, F)            (as_fatal (_("convert_frag\n")), 0)
+#define md_convert_frag(B, S, F)            as_fatal (_("convert_frag\n"))
 #define md_estimate_size_before_relax(A, B) (as_fatal (_("estimate size\n")),0)
 #define md_undefined_symbol(NAME)           0
 

diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 7547c0a03befff7469c8b7199741f1e7c332a7ef..d11b0c7f27e74e7d7d5a185833abc88654b1c698 100644 (file)
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -6963,7 +6963,7 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
   if (frag_now_fix () != 0
       && (! frag_now->tc_frag_data.is_insn
          || (vinsn_has_specific_opcodes (vinsn) && use_transform ())
-         || !use_transform () != frag_now->tc_frag_data.is_no_transform
+         || (!use_transform ()) != frag_now->tc_frag_data.is_no_transform
          || (directive_state[directive_longcalls]
              != frag_now->tc_frag_data.use_longcalls)
          || (directive_state[directive_absolute_literals]