OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Maciej W. Rozycki 2018-05-16 20:43:29 +01:00
parent 1624c9ca3f
commit 49d519ec2f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gas/ChangeLog
View File

@ -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

4
gas/config/tc-nds32.c
View File

@ -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);