From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Mon, 15 Jul 2013 18:36:57 +0000 (+0000)
Subject: gas/
X-Git-Tag: sid-snapshot-20130801~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a06e5a292c7b89ad04dd37c8e267c39909ef63b;p=thirdparty%2Fbinutils-gdb.git

gas/
	* config/tc-mips.c (match_save_restore_list_operand): Avoid -Wformat
	error with older GCCs.
	(mips16_macro_build): Dereference args.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6277f2463db..0a9af0d11f6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-15  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (match_save_restore_list_operand): Avoid -Wformat
+	error with older GCCs.
+	(mips16_macro_build): Dereference args.
+
 2013-07-14  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* config/tc-mips.c (mips_prefer_vec_regno, mips_parse_register):
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 1f9aa725ada..57df9a37227 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -4730,7 +4730,7 @@ match_save_restore_list_operand (struct mips_arg_info *arg)
     {
       if (arg->soft_match)
 	return FALSE;
-      as_bad (error);
+      as_bad ("%s", error);
     }
 
   /* Finally build the instruction.  */
@@ -7014,7 +7014,7 @@ mips16_macro_build (expressionS *ep, const char *name, const char *fmt,
 	  if (!operand)
 	    abort ();
 
-	  insn_insert_operand (&insn, operand, va_arg (args, int));
+	  insn_insert_operand (&insn, operand, va_arg (*args, int));
 	  break;
 	}
     }