From: Maciej W. Rozycki <macro@imgtec.com>
Date: Thu, 8 Dec 2016 22:55:42 +0000 (+0000)
Subject: ARC/GAS: Correct a `spaces' global shadowing error
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=731f7c4ea30cc409c45412eec15e3d66afe051f5;p=binutils-gdb.git

ARC/GAS: Correct a `spaces' global shadowing error

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'.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7def377fc5a..f05bcd4db45 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-08  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* config/tc-arc.c (arc_show_cpu_list): Rename `spaces' local
+	variable to `space_buf'.
+
 2016-12-08  Maciej W. Rozycki  <macro@imgtec.com>
 
 	* config/tc-arm.c (encode_arm_shift): Rename `index' local
diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index cebf198cae6..3542cdc7774 100644
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -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" : ", "));