aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/elf64-ppc.c36
1 files changed, 14 insertions, 22 deletions
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 7223c49..7b7bfa1 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -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;