diff --git a/gas/ChangeLog b/gas/ChangeLog
index 29c1c0adab..616fd09ba8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-21 Tim Newsome <tim@sifive.com>
+
+	* config/tc-riscv.c (riscv_pre_output_hook): Remove const from
+	loc4_frag.
+
 2016-12-21  Alan Modra  <amodra@gmail.com>
 
 	* doc/c-lm32.texi: Fix chars with high bit set.
diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c
index 2d953c54ca..8c78f614a5 100644
--- a/gas/config/tc-riscv.c
+++ b/gas/config/tc-riscv.c
@@ -2061,7 +2061,7 @@ riscv_pre_output_hook (void)
 	  {
 	    if (frag->fr_type == rs_cfa)
 	      {
-		const fragS *loc4_frag;
+		fragS *loc4_frag;
 		expressionS exp;
 
 		symbolS *add_symbol = frag->fr_symbol->sy_value.X_add_symbol;