diff options
| author | Arnold Metselaar <arnold.metselaar@planet.nl> | 2010-12-09 20:02:07 +0000 |
|---|---|---|
| committer | Arnold Metselaar <arnold.metselaar@planet.nl> | 2010-12-09 20:02:07 +0000 |
| commit | 31632c36651f8b88a205d2eaa080c2da90fd17af (patch) | |
| tree | 056d4f45565a3b6fff3dbd6075032a8050c27ec9 | |
| parent | c71cdcf4472664181b54b16482be8bd944317137 (diff) | |
| download | binutils-redhat-31632c36651f8b88a205d2eaa080c2da90fd17af.tar.gz | |
* config/tc-z80.c (md_apply_fix): Rename var to fix shadow warning.
| -rw-r--r-- | gas/ChangeLog | 4 | ||||
| -rw-r--r-- | gas/config/tc-z80.c | 26 |
2 files changed, 17 insertions, 13 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 48ea65b124..a42b3727da 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2010-12-09 Arnold Metselaar <arnold.metselaar@planet.nl> + + * config/tc-z80.c (md_apply_fix): Rename var to fix shadow warning. + 2010-12-09 Maciej W. Rozycki <macro@codesourcery.com> * config/tc-mips.c (macro_build, macro, mips_ip, md_apply_fix): diff --git a/gas/config/tc-z80.c b/gas/config/tc-z80.c index 7c13fa7788..06f8aaa021 100644 --- 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; |