Backport from trunk to fix faillure to compile with -Wshadow -Werror.

* config/tc-z80.c (md_apply_fix): Rename var to fix shadow warning.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8cf8c147b14d1a94d07269fe88bde6cabbd7a315..fa1a18af8278fa7bd24801cf19c372b85d059150 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-09  Arnold Metselaar  <arnold@phurua.lan>
+
+       Backport from trunk to fix faillure to compile with -Wshadow -Werror.
+       * config/tc-z80.c (md_apply_fix): Rename var to fix shadow warning.
+
 2010-12-07  Arnold Metselaar  <arnold.metselaar@planet.nl>
 
        Backport from trunk for PR gas/12269

diff --git a/gas/config/tc-z80.c b/gas/config/tc-z80.c
index 7c13fa77886b158c004b654b149b55214e52eaa9..06f8aaa0215cee6d1ee80cf29bfdc06682493832 100644 (file)
--- a/gas/config/tc-z80.c
+++ b/gas/config/tc-z80.c
@@ -1921,7 +1921,7 @@ void
 md_apply_fix (fixS * fixP, valueT* valP, segT seg ATTRIBUTE_UNUSED)
 {
   long val = * (long *) valP;
-  char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
+  char *p_lit = fixP->fx_where + fixP->fx_frag->fr_literal;
 
   switch (fixP->fx_r_type)
     {
@@ -1937,7 +1937,7 @@ md_apply_fix (fixS * fixP, valueT* valP, segT seg ATTRIBUTE_UNUSED)
          if (!fixP->fx_no_overflow)
             as_bad_where (fixP->fx_file, fixP->fx_line,
                          _("relative jump out of range"));
-         *buf++ = val;
+         *p_lit++ = val;
           fixP->fx_done = 1;
         }
       break;
@@ -1954,7 +1954,7 @@ md_apply_fix (fixS * fixP, valueT* valP, segT seg ATTRIBUTE_UNUSED)
          if (!fixP->fx_no_overflow)
             as_bad_where (fixP->fx_file, fixP->fx_line,
                          _("index offset  out of range"));
-         *buf++ = val;
+         *p_lit++ = val;
           fixP->fx_done = 1;
         }
       break;
@@ -1962,34 +1962,34 @@ md_apply_fix (fixS * fixP, valueT* valP, segT seg ATTRIBUTE_UNUSED)
     case BFD_RELOC_8:
       if (val > 255 || val < -128)
        as_warn_where (fixP->fx_file, fixP->fx_line, _("overflow"));
-      *buf++ = val;
+      *p_lit++ = val;
       fixP->fx_no_overflow = 1; 
       if (fixP->fx_addsy == NULL)
        fixP->fx_done = 1;
       break;
 
     case BFD_RELOC_16:
-      *buf++ = val;
-      *buf++ = (val >> 8);
+      *p_lit++ = val;
+      *p_lit++ = (val >> 8);
       fixP->fx_no_overflow = 1; 
       if (fixP->fx_addsy == NULL)
        fixP->fx_done = 1;
       break;
 
     case BFD_RELOC_24: /* Def24 may produce this.  */
-      *buf++ = val;
-      *buf++ = (val >> 8);
-      *buf++ = (val >> 16);
+      *p_lit++ = val;
+      *p_lit++ = (val >> 8);
+      *p_lit++ = (val >> 16);
       fixP->fx_no_overflow = 1; 
       if (fixP->fx_addsy == NULL)
        fixP->fx_done = 1;
       break;
 
     case BFD_RELOC_32: /* Def32 and .long may produce this.  */
-      *buf++ = val;
-      *buf++ = (val >> 8);
-      *buf++ = (val >> 16);
-      *buf++ = (val >> 24);
+      *p_lit++ = val;
+      *p_lit++ = (val >> 8);
+      *p_lit++ = (val >> 16);
+      *p_lit++ = (val >> 24);
       if (fixP->fx_addsy == NULL)
        fixP->fx_done = 1;
       break;