NDS32/GAS: Correct an `expr' global shadowing error for pre-4.8 GCC

Remove `-Wshadow' compilation errors:

cc1: warnings being treated as errors
.../gas/config/tc-nds32.c: In function 'md_assemble':
.../gas/config/tc-nds32.c:5212: error: declaration of 'expr' shadows a global declaration
.../gas/expr.h:180: error: shadowed declaration is here
make[4]: *** [tc-nds32.o] Error 1

which for versions of GCC before 4.8 prevent support for NDS32 targets
from being built.  See also GCC PR c/53066.

	gas/
	* tc-nds32.c (md_assemble): Rename `expr' local variable to
	`insn_expr'.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a89ffe16db5327854244e17d253e93b983e8445a..c2a5659143b8a8fafb284a8ba3e313f612010260 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-16  Maciej W. Rozycki  <macro@mips.com>
+
+       * tc-nds32.c (md_assemble): Rename `expr' local variable to
+       `insn_expr'.
+
 2018-05-15  Tamar Christina  <tamar.christina@arm.com>
 
        PR binutils/21446

diff --git a/gas/config/tc-nds32.c b/gas/config/tc-nds32.c
index 463fe23334ba014ddfd982990f87cd6b486cfa70..01bc17b6c22e8f09feccaa3b88a9ec44e07db966 100644 (file)
--- a/gas/config/tc-nds32.c
+++ b/gas/config/tc-nds32.c
@@ -5209,7 +5209,7 @@ void
 md_assemble (char *str)
 {
   struct nds32_asm_insn insn;
-  expressionS expr;
+  expressionS insn_expr;
   char *out;
   struct nds32_pseudo_opcode *popcode;
   const struct nds32_field *fld = NULL;
@@ -5245,7 +5245,7 @@ md_assemble (char *str)
     }
 
   label_exist = 0;
-  insn.info = & expr;
+  insn.info = &insn_expr;
   asm_desc.result = NASM_OK;
   nds32_assemble (&asm_desc, &insn, str);