This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH] NDS32/GAS: Correct an `expr' global shadowing error for pre-4.8 GCC
- From: "Maciej W. Rozycki" <macro at mips dot com>
- To: <binutils at sourceware dot org>
- Cc: Kuan-Lin Chen <kuanlinchentw at gmail dot com>, Wei-Cheng Wang <cole945 at gmail dot com>
- Date: Tue, 15 May 2018 15:46:35 +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'.
---
Hi,
I will commit this as obvious in a few days' time unless I hear
objections.
Maciej
---
gas/config/tc-nds32.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: binutils/gas/config/tc-nds32.c
===================================================================
--- binutils.orig/gas/config/tc-nds32.c 2018-03-02 12:41:47.000000000 +0000
+++ binutils/gas/config/tc-nds32.c 2018-04-12 15:12:24.554858386 +0100
@@ -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);