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

Replace "link" with "sh_link" 

On Linux/x86, GCC 4.2 issues a warning:

bfd/elf.c: In function ‘_bfd_elf_copy_private_bfd_data’:
bfd/elf.c:1334: warning: declaration of ‘link’ shadows a global declaration
/usr/include/unistd.h:757: warning: shadowed declaration is here
make[6]: *** [elf.lo] Error 1

Replace "link" with "sh_link" fixes it.

	* elf.c (_bfd_elf_copy_private_bfd_data): Replace "link" with
	"sh_link".
This commit is contained in:
H.J. Lu 2016-04-14 08:36:32 -07:00
parent d105775eea
commit 7634c4e679
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2016-04-14 H.J. Lu <hongjiu.lu@intel.com>
* elf.c (_bfd_elf_copy_private_bfd_data): Replace "link" with
"sh_link".
2016-04-14 Nick Clifton <nickc@redhat.com>
PR target/19938

22
bfd/elf.c
View File

@ -1331,7 +1331,7 @@ _bfd_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
{
const struct elf_backend_data *bed = get_elf_backend_data (obfd);
bfd_boolean changed = FALSE;
unsigned int link;
unsigned int sh_link;
/* Allow the target a chance to decide how these fields should
be set. */
@ -1347,11 +1347,12 @@ _bfd_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
bfd. */
if (iheader->sh_link != SHN_UNDEF)
{
link = find_link (obfd, iheaders[iheader->sh_link],
iheader->sh_link);
if (link != SHN_UNDEF)
sh_link = find_link (obfd,
iheaders[iheader->sh_link],
iheader->sh_link);
if (sh_link != SHN_UNDEF)
{
oheader->sh_link = link;
oheader->sh_link = sh_link;
changed = TRUE;
}
else
@ -1368,15 +1369,16 @@ _bfd_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
but if the SHF_LINK_INFO flag is set then it
should be interpreted as a section index. */
if (iheader->sh_flags & SHF_INFO_LINK)
link = find_link (obfd, iheaders[iheader->sh_info],
iheader->sh_info);
sh_link = find_link (obfd,
iheaders[iheader->sh_info],
iheader->sh_info);
else
/* No idea what it means - just copy it. */
link = iheader->sh_info;
sh_link = iheader->sh_info;
if (link != SHN_UNDEF)
if (sh_link != SHN_UNDEF)
{
oheader->sh_info = link;
oheader->sh_info = sh_link;
changed = TRUE;
}
else