This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[committed] ARC/GAS: Correct a `spaces' global shadowing error
- From: "Maciej W. Rozycki" <macro at imgtec dot com>
- To: <binutils at sourceware dot org>
- Cc: Claudiu Zissulescu <claziss at synopsys dot com>
- Date: Thu, 8 Dec 2016 23:39:50 +0000
- Subject: [committed] ARC/GAS: Correct a `spaces' global shadowing error
- Authentication-results: sourceware.org; auth=none
Fix a commit a9752fdf8398 ("[ARC] Sync cpu names with the ones accepted
by GCC.") build regression:
cc1: warnings being treated as errors
.../gas/config/tc-arc.c: In function 'arc_show_cpu_list':
.../gas/config/tc-arc.c:3452: error: declaration of 'spaces' shadows a global declaration
.../gas/../include/libiberty.h:248: error: shadowed declaration is here
make[4]: *** [tc-arc.o] Error 1
in a way following commit 91d6fa6a035c ("Add -Wshadow to the gcc command
line options used when compiling the binutils.").
gas/
* config/tc-arc.c (arc_show_cpu_list): Rename `spaces' local
variable to `space_buf'.
---
binutils-arc-gas-space-buf-fix.diff
Index: binutils/gas/config/tc-arc.c
===================================================================
--- binutils.orig/gas/config/tc-arc.c 2016-12-08 09:31:35.000000000 +0000
+++ binutils/gas/config/tc-arc.c 2016-12-08 14:34:46.707489958 +0000
@@ -3449,10 +3449,10 @@ static void
arc_show_cpu_list (FILE *stream)
{
int i, offset;
- static const char *spaces = " ";
+ static const char *space_buf = " ";
- fprintf (stream, "%s", spaces);
- offset = strlen (spaces);
+ fprintf (stream, "%s", space_buf);
+ offset = strlen (space_buf);
for (i = 0; cpu_types[i].name != NULL; ++i)
{
bfd_boolean last = (cpu_types[i + 1].name == NULL);
@@ -3462,8 +3462,8 @@ arc_show_cpu_list (FILE *stream)
characters, then it's time for a new line. */
if (offset + strlen (cpu_types[i].name) + (last ? 0 : 2) > 80)
{
- fprintf (stream, "\n%s", spaces);
- offset = strlen (spaces);
+ fprintf (stream, "\n%s", space_buf);
+ offset = strlen (space_buf);
}
fprintf (stream, "%s%s", cpu_types[i].name, (last ? "\n" : ", "));