* config/tc-mips.c (micromips_add_label): Avoid gcc warning.

(md_convert_frag): Likewise.
This commit is contained in:
Alan Modra
2011-10-19 23:09:11 +00:00
parent fa289a5fde
commit db9b2be466
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2011-10-20 Alan Modra <amodra@gmail.com>
* config/tc-mips.c (micromips_add_label): Avoid gcc warning.
(md_convert_frag): Likewise.
2011-10-18 Jie Zhang <jie@codesourcery.com>
Julian Brown <julian@codesourcery.com>
@ -18,7 +23,7 @@
* frags.h (bss_address_frag): Delete
(predefined_address_frag): New.
* frags.c (frag_init): Init predefined_address_frag. Delete ref
to bss_addres_frag.
to bss_address_frag.
* symbols.c (S_CAN_BE_REDEFINED): New function.
* symbols.h (S_CAN_BE_REDEFINED): Declare.
* read.c (assign_symbol): Use S_CAN_BE_REDEFINED.

View File

@ -1,6 +1,6 @@
/* tc-mips.c -- assemble code for a MIPS chip.
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
Contributed by the OSF and Ralph Campbell.
Written by Keith Knowles and Ralph Campbell, working independently.
@ -3920,6 +3920,8 @@ micromips_add_label (void)
#if defined(OBJ_ELF) || defined(OBJ_MAYBE_ELF)
if (IS_ELF)
S_SET_OTHER (s, ELF_ST_SET_MICROMIPS (S_GET_OTHER (s)));
#else
(void) s;
#endif
}
@ -18228,7 +18230,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT asec, fragS *fragp)
| RELAX_DELAY_SLOT_SIZE_SECOND);
msg = macro_warning (s);
if (msg != NULL)
as_warn_where (fragp->fr_file, fragp->fr_line, msg);
as_warn_where (fragp->fr_file, fragp->fr_line, "%s", msg);
subtype &= ~s;
}
@ -18242,7 +18244,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT asec, fragS *fragp)
& (RELAX_SECOND_LONGER | RELAX_NOMACRO | RELAX_DELAY_SLOT));
msg = macro_warning (s);
if (msg != NULL)
as_warn_where (fragp->fr_file, fragp->fr_line, msg);
as_warn_where (fragp->fr_file, fragp->fr_line, "%s", msg);
subtype &= ~s;
}