diff --git a/gas/ChangeLog b/gas/ChangeLog
index 29ec3ecda94..f1f588e7ea4 100644
--- 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 70ceb213290..0895ae9d6f3 100644
--- 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