diff --git a/gas/ChangeLog b/gas/ChangeLog
index 58f2ef4ce1..17bdf52323 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2017-07-24  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* dwarf2dbg.c (dwarf2dbg_final_check): Rename local variable exp
+	from expr.
+
 2017-07-21  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
 
 	* config/tc-s390.c (s390_parse_cpu): Add z14 as alternate CPU
diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index 4f703304d5..ad9d3f3033 100644
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -2243,21 +2243,21 @@ dwarf2dbg_final_check (void)
      holding the check value in X_op_symbol.  */
   while (view_assert_failed)
     {
-      expressionS *expr;
+      expressionS *exp;
       symbolS *sym;
       offsetT failed;
 
       gas_assert (!symbol_resolved_p (view_assert_failed));
 
-      expr = symbol_get_value_expression (view_assert_failed);
+      exp = symbol_get_value_expression (view_assert_failed);
       sym = view_assert_failed;
 
       /* If view_assert_failed looks like a compound check in the
 	 chain, break it up.  */
-      if (expr->X_op == O_add && expr->X_add_number == 0 && expr->X_unsigned)
+      if (exp->X_op == O_add && exp->X_add_number == 0 && exp->X_unsigned)
 	{
-	  view_assert_failed = expr->X_add_symbol;
-	  sym = expr->X_op_symbol;
+	  view_assert_failed = exp->X_add_symbol;
+	  sym = exp->X_op_symbol;
 	}
       else
 	view_assert_failed = NULL;