From 49d519ec2fe80b48f404c0209b41bf8fee47cf39 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Wed, 16 May 2018 20:43:29 +0100 Subject: [PATCH] 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'. --- gas/ChangeLog | 5 +++++ gas/config/tc-nds32.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index a89ffe16db5..c2a5659143b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2018-05-16 Maciej W. Rozycki + + * tc-nds32.c (md_assemble): Rename `expr' local variable to + `insn_expr'. + 2018-05-15 Tamar Christina PR binutils/21446 diff --git a/gas/config/tc-nds32.c b/gas/config/tc-nds32.c index 463fe23334b..01bc17b6c22 100644 --- 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); -- 2.30.2