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

[deliverable/binutils-gdb.git] / gas / config / tc-score.c

diff --git a/gas/config/tc-score.c b/gas/config/tc-score.c
index c1d8f7b4ac249ff31d0892460cb30f85a070637b..61220de3eac2e09b2f90e26ec464e8ee669895c3 100644 (file)
--- a/gas/config/tc-score.c
+++ b/gas/config/tc-score.c
@@ -58,7 +58,7 @@ static void s_score_lcomm (int bytes_p);
 static void s3_md_number_to_chars (char *buf, valueT val, int n);
 static valueT s3_md_chars_to_number (char *buf, int n);
 static void s3_assemble (char *str);
-static void s3_operand (expressionS * expr);
+static void s3_operand (expressionS *);
 static void s3_begin (void);
 static void s3_number_to_chars (char *buf, valueT val, int n);
 static char *s3_atof (int type, char *litP, int *sizeP);
@@ -2490,7 +2490,7 @@ s3_get_insn_class_from_type (enum score_insn_type type)
    32-bit instruction: 1, 0.
    16-bit instruction: 0.  */
 static bfd_vma
-s3_adjust_paritybit (bfd_vma m_code, enum insn_class class)
+s3_adjust_paritybit (bfd_vma m_code, enum insn_class i_class)
 {
   bfd_vma result = 0;
   bfd_vma m_code_high = 0;
@@ -2500,7 +2500,7 @@ s3_adjust_paritybit (bfd_vma m_code, enum insn_class class)
   unsigned long pb_middle = 0;
   unsigned long pb_low = 0;
 
-  if (class == INSN_CLASS_48)
+  if (i_class == INSN_CLASS_48)
     {
       pb_high = 0x800000000000LL;
       pb_middle = 0x80000000;
@@ -2512,7 +2512,7 @@ s3_adjust_paritybit (bfd_vma m_code, enum insn_class class)
                pb_middle | (m_code_middle << 1) |
                pb_low | m_code_low;
     }
-  else if (class == INSN_CLASS_32 || class == INSN_CLASS_SYN)
+  else if (i_class == INSN_CLASS_32 || i_class == INSN_CLASS_SYN)
     {
       pb_high = 0x80000000;
       pb_low = 0x00000000;
@@ -2520,7 +2520,7 @@ s3_adjust_paritybit (bfd_vma m_code, enum insn_class class)
       m_code_low = m_code & 0x00007fff;
       result = pb_high | (m_code_high << 1) | pb_low | m_code_low;
     }
-  else if (class == INSN_CLASS_16)
+  else if (i_class == INSN_CLASS_16)
     {
       pb_high = 0;
       pb_low = 0;
@@ -2528,7 +2528,7 @@ s3_adjust_paritybit (bfd_vma m_code, enum insn_class class)
       m_code_low = m_code & 0x00007fff;
       result = pb_high | (m_code_high << 1) | pb_low | m_code_low;
     }
-  else if (class == INSN_CLASS_PCE)
+  else if (i_class == INSN_CLASS_PCE)
     {
       /* Keep original.  */
       pb_high = 0;
@@ -3138,7 +3138,6 @@ s3_do_ldst_insn (char *str)
 
           if (s3_inst.reloc.exp.X_op == O_constant)
             {
-              int value;
               unsigned int data_type;
 
               if (pre_inc == 1)
@@ -6510,11 +6509,11 @@ s3_assemble (char *str)
 }
 
 static void
-s3_operand (expressionS * expr)
+s3_operand (expressionS * exp)
 {
   if (s3_in_my_get_expression)
     {
-      expr->X_op = O_illegal;
+      exp->X_op = O_illegal;
       if (s3_inst.error == NULL)
         {
           s3_inst.error = _("bad expression");
@@ -7522,12 +7521,12 @@ md_assemble (char *str)
 /* We handle all bad expressions here, so that we can report the faulty
    instruction in the error message.  */
 void
-md_operand (expressionS * expr)
+md_operand (expressionS * exp)
 {
   if (score3)
-    s3_operand (expr);
+    s3_operand (exp);
   else
-    s7_operand (expr);
+    s7_operand (exp);
 }
 
 /* Turn an integer of n bytes (in val) into a stream of bytes appropriate