Add -Wshadow to the gcc command line options used when compiling the binutils.

Fix up all warnings generated by the addition of this switch.

1 files changed, 16 insertions, 16 deletions

diff --git a/gas/config/tc-z8k.c b/gas/config/tc-z8k.c
index a66ae90..7cc061a 100644
--- a/gas/config/tc-z8k.c
+++ b/gas/config/tc-z8k.c
@@ -203,7 +203,7 @@ static int the_interrupt;
    number.  */
 
 static char *
-whatreg (unsigned int *reg, char *src)
+whatreg (unsigned int *preg, char *src)
 {
   unsigned int new_reg;
 
@@ -222,7 +222,7 @@ whatreg (unsigned int *reg, char *src)
   if (src[0] != 0 && src[0] != ',' && src[0] != '(' && src[0] != ')')
     return NULL;
 
-  *reg = new_reg;
+  *preg = new_reg;
   return src;
 }
 
@@ -244,7 +244,7 @@ whatreg (unsigned int *reg, char *src)
    in SRC after the reg name.  */
 
 static char *
-parse_reg (char *src, int *mode, unsigned int *reg)
+parse_reg (char *src, int *mode, unsigned int *preg)
 {
   char *res = NULL;
   char regno;
@@ -257,12 +257,12 @@ parse_reg (char *src, int *mode, unsigned int *reg)
       if (segmented_mode)
 	{
 	  *mode = CLASS_REG_LONG;
-	  *reg = 14;
+	  *preg = 14;
 	}
       else
 	{
 	  *mode = CLASS_REG_WORD;
-	  *reg = 15;
+	  *preg = 15;
 	}
       return src + 2;
     }
@@ -274,10 +274,10 @@ parse_reg (char *src, int *mode, unsigned int *reg)
 	  if (src[2] < '0' || src[2] > '9')
 	    return NULL;	/* Assume no register name but a label starting with 'rr'.  */
 	  *mode = CLASS_REG_LONG;
-	  res = whatreg (reg, src + 2);
+	  res = whatreg (preg, src + 2);
 	  if (res == NULL)
 	    return NULL;	/* Not a valid register name.  */
-	  regno = *reg;
+	  regno = *preg;
 	  if (regno > 14)
 	    as_bad (_("register rr%d out of range"), regno);
 	  if (regno & 1)
@@ -288,10 +288,10 @@ parse_reg (char *src, int *mode, unsigned int *reg)
 	  if (src[2] < '0' || src[2] > '9')
 	    return NULL;	/* Assume no register name but a label starting with 'rh'.  */
 	  *mode = CLASS_REG_BYTE;
-	  res = whatreg (reg, src + 2);
+	  res = whatreg (preg, src + 2);
 	  if (res == NULL)
 	    return NULL;	/* Not a valid register name.  */
-	  regno = *reg;
+	  regno = *preg;
 	  if (regno > 7)
 	    as_bad (_("register rh%d out of range"), regno);
 	}
@@ -300,23 +300,23 @@ parse_reg (char *src, int *mode, unsigned int *reg)
 	  if (src[2] < '0' || src[2] > '9')
 	    return NULL;	/* Assume no register name but a label starting with 'rl'.  */
 	  *mode = CLASS_REG_BYTE;
-	  res = whatreg (reg, src + 2);
+	  res = whatreg (preg, src + 2);
 	  if (res == NULL)
 	    return NULL;	/* Not a valid register name.  */
-	  regno = *reg;
+	  regno = *preg;
 	  if (regno > 7)
 	    as_bad (_("register rl%d out of range"), regno);
-	  *reg += 8;
+	  *preg += 8;
 	}
       else if (src[1] == 'q' || src[1] == 'Q')
 	{
 	  if (src[2] < '0' || src[2] > '9')
 	    return NULL;	/* Assume no register name but a label starting with 'rq'.  */
 	  *mode = CLASS_REG_QUAD;
-	  res = whatreg (reg, src + 2);
+	  res = whatreg (preg, src + 2);
 	  if (res == NULL)
 	    return NULL;	/* Not a valid register name.  */
-	  regno = *reg;
+	  regno = *preg;
 	  if (regno > 12)
 	    as_bad (_("register rq%d out of range"), regno);
 	  if (regno & 3)
@@ -327,10 +327,10 @@ parse_reg (char *src, int *mode, unsigned int *reg)
 	  if (src[1] < '0' || src[1] > '9')
 	    return NULL;	/* Assume no register name but a label starting with 'r'.  */
 	  *mode = CLASS_REG_WORD;
-	  res = whatreg (reg, src + 1);
+	  res = whatreg (preg, src + 1);
 	  if (res == NULL)
 	    return NULL;	/* Not a valid register name.  */
-	  regno = *reg;
+	  regno = *preg;
 	  if (regno > 15)
 	    as_bad (_("register r%d out of range"), regno);
 	}