espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-22 02:50:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR gas/13224

Browse Source 
* config/obj-elf.c (obj_elf_parse_section_letters): Rename 'clone'
	to 'is_clone' to avoid shadowing a gloabl.
	(obj_elf_section): Likewise.
This commit is contained in:
Nick Clifton
2012-02-02 09:26:04 +00:00
parent 1c9e87ee56
commit f6616a063c
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gas/ChangeLog
View File

@ -1,3 +1,10 @@
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> 2012-01-31 Paul Brook <paul@codesourcery.com>
* doc/c-tic6x.c: Fix typo. * doc/c-tic6x.c: Fix typo.

18
gas/config/obj-elf.c
View File

@ -1,6 +1,6 @@
/* ELF object file format /* ELF object file format
Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler. This file is part of GAS, the GNU Assembler.
@ -741,10 +741,10 @@ obj_elf_change_section (const char *name,
} }
static bfd_vma 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; bfd_vma attr = 0;
*clone = FALSE; *is_clone = FALSE;
while (len > 0) while (len > 0)
{ {
@ -775,7 +775,7 @@ obj_elf_parse_section_letters (char *str, size_t len, bfd_boolean *clone)
attr |= SHF_TLS; attr |= SHF_TLS;
break; break;
case '?': case '?':
*clone = TRUE; *is_clone = TRUE;
break; break;
/* Compatibility. */ /* Compatibility. */
case 'm': case 'm':
@ -978,7 +978,7 @@ obj_elf_section (int push)
if (*input_line_pointer == '"') if (*input_line_pointer == '"')
{ {
bfd_boolean clone; bfd_boolean is_clone;
beg = demand_copy_C_string (&dummy); beg = demand_copy_C_string (&dummy);
if (beg == NULL) if (beg == NULL)
@ -986,7 +986,7 @@ obj_elf_section (int push)
ignore_rest_of_line (); ignore_rest_of_line ();
return; return;
} }
attr |= obj_elf_parse_section_letters (beg, strlen (beg), &clone); attr |= obj_elf_parse_section_letters (beg, strlen (beg), &is_clone);
SKIP_WHITESPACE (); SKIP_WHITESPACE ();
if (*input_line_pointer == ',') if (*input_line_pointer == ',')
@ -1038,10 +1038,10 @@ obj_elf_section (int push)
attr &= ~SHF_MERGE; attr &= ~SHF_MERGE;
} }
if ((attr & SHF_GROUP) != 0 && clone) if ((attr & SHF_GROUP) != 0 && is_clone)
{ {
as_warn (_("? section flag ignored with G present")); as_warn (_("? section flag ignored with G present"));
clone = FALSE; is_clone = FALSE;
} }
if ((attr & SHF_GROUP) != 0 && *input_line_pointer == ',') if ((attr & SHF_GROUP) != 0 && *input_line_pointer == ',')
{ {
@ -1063,7 +1063,7 @@ obj_elf_section (int push)
attr &= ~SHF_GROUP; attr &= ~SHF_GROUP;
} }
if (clone) if (is_clone)
{ {
const char *now_group = elf_group_name (now_seg); const char *now_group = elf_group_name (now_seg);
if (now_group != NULL) if (now_group != NULL)