mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-06 12:09:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Work around gcc-4 warnings in elf64-ppc.c

Browse Source 
elf64-ppc.c: In function 'ppc64_elf_size_dynamic_sections':
elf64-ppc.c:10309:45: error: value computed is not used [-Werror=unused-value]
     ++lgot_ents, ++lgot_masks, isym != NULL && isym++)

It is of course a silly warning, fixed in later versions of gcc.  I
wrote "isym != NULL && isym++" rather than the simpler "isym++" to
stop sanitisers complaining about incrementing a NULL pointer.  isym
is of course unused in any code path where it might start off as
NULL.  Sometimes you can't win.  So don't try to be clever in reading
local symbols only when needed.  99 times out of 100 they will be
cached anyway.

	* elf64-ppc.c (ppc64_elf_size_dynamic_sections): Avoid annoying
	warnings by always reading local syms.
	(ppc64_elf_layout_multitoc): Likewise.
This commit is contained in:
Alan Modra 2022-02-09 16:21:02 +10:30
parent 5049d00eb7
commit c9fecd6283
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bfd/elf64-ppc.c
View File

@ -10292,22 +10292,18 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd,
local_plt = (struct plt_entry **) end_lgot_ents;
end_local_plt = local_plt + locsymcount;
lgot_masks = (unsigned char *) end_local_plt;
local_syms = NULL;
if (bfd_link_pic (info))
local_syms = (Elf_Internal_Sym *) symtab_hdr->contents;
if (local_syms == NULL && locsymcount != 0)
{
local_syms = (Elf_Internal_Sym *) symtab_hdr->contents;
if (local_syms == NULL && locsymcount != 0)
{
local_syms = bfd_elf_get_elf_syms (ibfd, symtab_hdr, locsymcount,
0, NULL, NULL, NULL);
if (local_syms == NULL)
return false;
}
local_syms = bfd_elf_get_elf_syms (ibfd, symtab_hdr, locsymcount,
0, NULL, NULL, NULL);
if (local_syms == NULL)
return false;
}
s = ppc64_elf_tdata (ibfd)->got;
for (isym = local_syms;
lgot_ents < end_lgot_ents;
++lgot_ents, ++lgot_masks, isym != NULL && isym++)
++lgot_ents, ++lgot_masks, isym++)
{
struct got_entry **pent, *ent;
@ -12828,22 +12824,18 @@ ppc64_elf_layout_multitoc (struct bfd_link_info *info)
local_plt = (struct plt_entry **) end_lgot_ents;
end_local_plt = local_plt + locsymcount;
lgot_masks = (unsigned char *) end_local_plt;
local_syms = NULL;
if (bfd_link_pic (info))
local_syms = (Elf_Internal_Sym *) symtab_hdr->contents;
if (local_syms == NULL && locsymcount != 0)
{
local_syms = (Elf_Internal_Sym *) symtab_hdr->contents;
if (local_syms == NULL && locsymcount != 0)
{
local_syms = bfd_elf_get_elf_syms (ibfd, symtab_hdr, locsymcount,
0, NULL, NULL, NULL);
if (local_syms == NULL)
return false;
}
local_syms = bfd_elf_get_elf_syms (ibfd, symtab_hdr, locsymcount,
0, NULL, NULL, NULL);
if (local_syms == NULL)
return false;
}
s = ppc64_elf_tdata (ibfd)->got;
for (isym = local_syms;
lgot_ents < end_lgot_ents;
++lgot_ents, ++lgot_masks, isym != NULL && isym++)
++lgot_ents, ++lgot_masks, isym++)
{
struct got_entry *ent;