OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BFD/ELF: Correct a `remove' global shadowing error for pre-4.8 GCC 

Remove `-Wshadow' compilation errors:

cc1: warnings being treated as errors
.../bfd/elflink.c: In function 'bfd_elf_final_link':
.../bfd/elflink.c:11722: error: declaration of 'remove' shadows a global declaration
/usr/include/stdio.h:154: error: shadowed declaration is here

which for versions of GCC before 4.8 prevent support for ELF targets
from being built.  See also GCC PR c/53066.

	bfd/
	* elflink.c (bfd_elf_final_link): Rename `remove' local variable
	to `remove_section'.
This commit is contained in:
Maciej W. Rozycki 2018-07-11 00:42:43 +01:00
parent be570f0684
commit 5270eddc6e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2018-07-10 Maciej W. Rozycki <macro@mips.com>
* elflink.c (bfd_elf_final_link): Rename `remove' local variable
to `remove_section'.
2018-07-10 Alan Modra <amodra@gmail.com>
* elf32-xgate.h: Delete.

8
bfd/elflink.c
View File

@ -11719,7 +11719,7 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
std_attrs_section = get_elf_backend_data (abfd)->obj_attrs_section;
for (o = abfd->sections; o != NULL; o = o->next)
{
bfd_boolean remove = FALSE;
bfd_boolean remove_section = FALSE;
if ((std_attrs_section && strcmp (o->name, std_attrs_section) == 0)
|| strcmp (o->name, ".gnu.attributes") == 0)
@ -11743,14 +11743,14 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
if (attr_size)
attr_section = o;
else
remove = TRUE;
remove_section = TRUE;
}
else if ((o->flags & SEC_GROUP) != 0 && o->size == 0)
{
/* Remove empty group section from linker output. */
remove = TRUE;
remove_section = TRUE;
}
if (remove)
if (remove_section)
{
o->flags |= SEC_EXCLUDE;
bfd_section_list_remove (abfd, o);