make microblaze build with -Wwrite-strings

frag_var () assigns its last argument to frag::fr_opcode, and it turns out
some targets modify the string that points to.  However it appears niether the
generic code or the microblaze code modifies what fr_opcode points to, so this
code should be safe.  So we unfortunately need to cast to char * when passing
an argument to frag_var () but otherwise microblaze can itself point to these
strings with const char *.

gas/ChangeLog:

2016-03-24  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>

	* config/tc-microblaze.c (md_assemble): Cast opc to char * when calling
	frag_var ().

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 29ec3ecda9436e0ea9b9afb7a8aa54fb41382559..f1f588e7ea42113db006000a9d2329c7ee35373e 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-24  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+       * config/tc-microblaze.c (md_assemble): Cast opc to char * when calling
+       frag_var ().
+
 2016-03-24  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
 
        * config/tc-visium.c (md_atof): Localize the string returned on

diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
index 70ceb2132903cca9fbd9b5b2ed05995a80e36d7f..0895ae9d6f3305fc65cef6ed04c333481d9de295 100644 (file)
--- a/gas/config/tc-microblaze.c
+++ b/gas/config/tc-microblaze.c
@@ -840,8 +840,8 @@ parse_cons_expression_microblaze (expressionS *exp, int size)
    machine dependent instruction.  This function is supposed to emit
    the frags/bytes it assembles to.  */
 
-static char * str_microblaze_ro_anchor = "RO";
-static char * str_microblaze_rw_anchor = "RW";
+static const char * str_microblaze_ro_anchor = "RO";
+static const char * str_microblaze_rw_anchor = "RW";
 
 static bfd_boolean
 check_spl_reg (unsigned * reg)
@@ -1014,7 +1014,7 @@ md_assemble (char * str)
 
       if (exp.X_op != O_constant)
        {
-          char *opc;
+          const char *opc;
          relax_substateT subtype;
 
           if (streq (name, "lmi"))
@@ -1039,7 +1039,7 @@ md_assemble (char * str)
                             subtype,   /* PC-relative or not.  */
                             exp.X_add_symbol,
                             exp.X_add_number,
-                            opc);
+                            (char *) opc);
          immed = 0;
         }
       else