diff options
| -rw-r--r-- | gas/ChangeLog | 9 | ||||
| -rw-r--r-- | gas/config/obj-elf.c | 18 |
2 files changed, 17 insertions, 10 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 852c1ea..f37e6b0 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,12 @@ +2012-02-02 Nick Clifton <nickc@redhat.com> + + PR gas/13224 + * config/obj-elf.c (obj_elf_parse_section_letters): Rename 'clone' + to 'is_clone' to avoid shadowing a gloabl. + (obj_elf_section): Likewise. + 2012-01-31 Paul Brook <paul@codesourcery.com> - + * doc/c-tic6x.c: Fix typo. 2012-01-26 Alexey Makhalov <makhaloff@gmail.com> diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c index 287de6a..a101e8a 100644 --- a/gas/config/obj-elf.c +++ b/gas/config/obj-elf.c @@ -1,6 +1,6 @@ /* ELF object file format Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -741,10 +741,10 @@ obj_elf_change_section (const char *name, } static bfd_vma -obj_elf_parse_section_letters (char *str, size_t len, bfd_boolean *clone) +obj_elf_parse_section_letters (char *str, size_t len, bfd_boolean *is_clone) { bfd_vma attr = 0; - *clone = FALSE; + *is_clone = FALSE; while (len > 0) { @@ -775,7 +775,7 @@ obj_elf_parse_section_letters (char *str, size_t len, bfd_boolean *clone) attr |= SHF_TLS; break; case '?': - *clone = TRUE; + *is_clone = TRUE; break; /* Compatibility. */ case 'm': @@ -978,7 +978,7 @@ obj_elf_section (int push) if (*input_line_pointer == '"') { - bfd_boolean clone; + bfd_boolean is_clone; beg = demand_copy_C_string (&dummy); if (beg == NULL) @@ -986,7 +986,7 @@ obj_elf_section (int push) ignore_rest_of_line (); return; } - attr |= obj_elf_parse_section_letters (beg, strlen (beg), &clone); + attr |= obj_elf_parse_section_letters (beg, strlen (beg), &is_clone); SKIP_WHITESPACE (); if (*input_line_pointer == ',') @@ -1038,10 +1038,10 @@ obj_elf_section (int push) attr &= ~SHF_MERGE; } - if ((attr & SHF_GROUP) != 0 && clone) + if ((attr & SHF_GROUP) != 0 && is_clone) { as_warn (_("? section flag ignored with G present")); - clone = FALSE; + is_clone = FALSE; } if ((attr & SHF_GROUP) != 0 && *input_line_pointer == ',') { @@ -1063,7 +1063,7 @@ obj_elf_section (int push) attr &= ~SHF_GROUP; } - if (clone) + if (is_clone) { const char *now_group = elf_group_name (now_seg); if (now_group != NULL) |