MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PowerPC use_local_plt

Browse Source 
Put the logic to select local vs. usual .plt section in one place.

	* elf64-ppc.c (elf_hash_entry): New inline function.  Use
	throughout to replace casts.
	(branch_reloc_hash_match): Remove const from params.
	(use_local_plt): New function.
	(allocate_dynrelocs, ppc_build_one_stub, ppc_size_one_stub),
	(build_global_entry_stubs_and_plt, ppc64_elf_relocate_section):
	Use use_local_plt.
	* elf32-ppc.c (use_local_plt): New function.
	(allocate_dynrelocs, ppc_elf_relocate_section),
	(write_global_sym_plt): Use use_local_plt.
This commit is contained in:
Alan Modra 2021-01-19 19:26:11 +10:30
parent a75a6a4164
commit 30845f113a
3 changed files with 78 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bfd/ChangeLog
View File

@ -1,3 +1,16 @@
2021-01-19 Alan Modra <amodra@gmail.com>
* elf64-ppc.c (elf_hash_entry): New inline function. Use
throughout to replace casts.
(branch_reloc_hash_match): Remove const from params.
(use_local_plt): New function.
(allocate_dynrelocs, ppc_build_one_stub, ppc_size_one_stub),
(build_global_entry_stubs_and_plt, ppc64_elf_relocate_section):
Use use_local_plt.
* elf32-ppc.c (use_local_plt): New function.
(allocate_dynrelocs, ppc_elf_relocate_section),
(write_global_sym_plt): Use use_local_plt.
2021-01-17 H.J. Lu <hongjiu.lu@intel.com> 2021-01-17 H.J. Lu <hongjiu.lu@intel.com>
PR ld/27193 PR ld/27193

48
bfd/elf32-ppc.c
View File

@ -5094,6 +5094,18 @@ ensure_undef_dynamic (struct bfd_link_info *info,
return TRUE; return TRUE;
} }
/* Choose whether to use htab->iplt or htab->pltlocal rather than the
usual htab->elf.splt section for a PLT entry. */
static inline
bfd_boolean use_local_plt (struct bfd_link_info *info,
struct elf_link_hash_entry *h)
{
return (h == NULL
|| h->dynindx == -1
|| !elf_hash_table (info)->dynamic_sections_created);
}
/* Allocate space in associated reloc sections for dynamic relocs. */ /* Allocate space in associated reloc sections for dynamic relocs. */
static bfd_boolean static bfd_boolean
@ -5103,7 +5115,6 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
struct ppc_elf_link_hash_entry *eh; struct ppc_elf_link_hash_entry *eh;
struct ppc_elf_link_hash_table *htab; struct ppc_elf_link_hash_table *htab;
struct elf_dyn_relocs *p; struct elf_dyn_relocs *p;
bfd_boolean dyn;
if (h->root.type == bfd_link_hash_indirect) if (h->root.type == bfd_link_hash_indirect)
return TRUE; return TRUE;
@ -5271,8 +5282,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
b) is an ifunc, or b) is an ifunc, or
c) has plt16 relocs and has been processed by adjust_dynamic_symbol, or c) has plt16 relocs and has been processed by adjust_dynamic_symbol, or
d) has plt16 relocs and we are linking statically. */ d) has plt16 relocs and we are linking statically. */
dyn = htab->elf.dynamic_sections_created && h->dynindx != -1; if ((htab->elf.dynamic_sections_created && h->dynindx != -1)
if (dyn
|| h->type == STT_GNU_IFUNC || h->type == STT_GNU_IFUNC
|| (h->needs_plt && h->dynamic_adjusted) || (h->needs_plt && h->dynamic_adjusted)
|| (h->needs_plt || (h->needs_plt
@ -5290,6 +5300,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
if (ent->plt.refcount > 0) if (ent->plt.refcount > 0)
{ {
asection *s = htab->elf.splt; asection *s = htab->elf.splt;
bfd_boolean dyn = !use_local_plt (info, h);
if (!dyn) if (!dyn)
{ {
@ -8373,9 +8384,7 @@ ppc_elf_relocate_section (bfd *output_bfd,
unresolved_reloc = FALSE; unresolved_reloc = FALSE;
plt = htab->elf.splt; plt = htab->elf.splt;
if (!htab->elf.dynamic_sections_created if (use_local_plt (info, h))
|| h == NULL
|| h->dynindx == -1)
{ {
if (ifunc != NULL) if (ifunc != NULL)
plt = htab->elf.iplt; plt = htab->elf.iplt;
@ -9351,6 +9360,8 @@ write_global_sym_plt (struct elf_link_hash_entry *h, void *inf)
for (ent = h->plt.plist; ent != NULL; ent = ent->next) for (ent = h->plt.plist; ent != NULL; ent = ent->next)
if (ent->plt.offset != (bfd_vma) -1) if (ent->plt.offset != (bfd_vma) -1)
{ {
bfd_boolean dyn = !use_local_plt (info, h);
if (!doneone) if (!doneone)
{ {
Elf_Internal_Rela rela; Elf_Internal_Rela rela;
@ -9359,9 +9370,7 @@ write_global_sym_plt (struct elf_link_hash_entry *h, void *inf)
asection *plt = htab->elf.splt; asection *plt = htab->elf.splt;
asection *relplt = htab->elf.srelplt; asection *relplt = htab->elf.srelplt;
if (htab->plt_type == PLT_NEW if (htab->plt_type == PLT_NEW || !dyn)
|| !htab->elf.dynamic_sections_created
|| h->dynindx == -1)
reloc_index = ent->plt.offset / 4; reloc_index = ent->plt.offset / 4;
else else
{ {
@ -9374,9 +9383,7 @@ write_global_sym_plt (struct elf_link_hash_entry *h, void *inf)
/* This symbol has an entry in the procedure linkage table. /* This symbol has an entry in the procedure linkage table.
Set it up. */ Set it up. */
if (htab->plt_type == PLT_VXWORKS if (htab->plt_type == PLT_VXWORKS && dyn)
&& htab->elf.dynamic_sections_created
&& h->dynindx != -1)
{ {
bfd_vma got_offset; bfd_vma got_offset;
const bfd_vma *plt_entry; const bfd_vma *plt_entry;
@ -9499,8 +9506,7 @@ write_global_sym_plt (struct elf_link_hash_entry *h, void *inf)
else else
{ {
rela.r_addend = 0; rela.r_addend = 0;
if (!htab->elf.dynamic_sections_created if (!dyn)
|| h->dynindx == -1)
{ {
if (h->type == STT_GNU_IFUNC) if (h->type == STT_GNU_IFUNC)
{ {
@ -9529,9 +9535,7 @@ write_global_sym_plt (struct elf_link_hash_entry *h, void *inf)
+ plt->output_offset + plt->output_offset
+ ent->plt.offset); + ent->plt.offset);
if (htab->plt_type == PLT_OLD if (htab->plt_type == PLT_OLD || !dyn)
|| !htab->elf.dynamic_sections_created
|| h->dynindx == -1)
{ {
/* We don't need to fill in the .plt. The ppc dynamic /* We don't need to fill in the .plt. The ppc dynamic
linker will fill it in. */ linker will fill it in. */
@ -9550,8 +9554,7 @@ write_global_sym_plt (struct elf_link_hash_entry *h, void *inf)
if (relplt != NULL) if (relplt != NULL)
{ {
/* Fill in the entry in the .rela.plt section. */ /* Fill in the entry in the .rela.plt section. */
if (!htab->elf.dynamic_sections_created if (!dyn)
|| h->dynindx == -1)
{ {
if (h->type == STT_GNU_IFUNC) if (h->type == STT_GNU_IFUNC)
rela.r_info = ELF32_R_INFO (0, R_PPC_IRELATIVE); rela.r_info = ELF32_R_INFO (0, R_PPC_IRELATIVE);
@ -9574,15 +9577,12 @@ write_global_sym_plt (struct elf_link_hash_entry *h, void *inf)
doneone = TRUE; doneone = TRUE;
} }
if (htab->plt_type == PLT_NEW if (htab->plt_type == PLT_NEW || !dyn)
|| !htab->elf.dynamic_sections_created
|| h->dynindx == -1)
{ {
unsigned char *p; unsigned char *p;
asection *plt = htab->elf.splt; asection *plt = htab->elf.splt;
if (!htab->elf.dynamic_sections_created if (!dyn)
|| h->dynindx == -1)
{ {
if (h->type == STT_GNU_IFUNC) if (h->type == STT_GNU_IFUNC)
plt = htab->elf.iplt; plt = htab->elf.iplt;

77
bfd/elf64-ppc.c
View File

@ -3149,6 +3149,12 @@ ppc_elf_hash_entry (struct elf_link_hash_entry *ent)
return (struct ppc_link_hash_entry *) ent; return (struct ppc_link_hash_entry *) ent;
} }
static inline struct elf_link_hash_entry *
elf_hash_entry (struct ppc_link_hash_entry *ent)
{
return (struct elf_link_hash_entry *) ent;
}
/* ppc64 ELF linker hash table. */ /* ppc64 ELF linker hash table. */
struct ppc_link_hash_table struct ppc_link_hash_table
@ -5656,10 +5662,10 @@ static bfd_boolean
is_tls_get_addr (struct elf_link_hash_entry *h, is_tls_get_addr (struct elf_link_hash_entry *h,
struct ppc_link_hash_table *htab) struct ppc_link_hash_table *htab)
{ {
return (h == (struct elf_link_hash_entry *) htab->tls_get_addr_fd return (h == elf_hash_entry (htab->tls_get_addr_fd)
|| h == (struct elf_link_hash_entry *) htab->tga_desc_fd || h == elf_hash_entry (htab->tga_desc_fd)
|| h == (struct elf_link_hash_entry *) htab->tls_get_addr || h == elf_hash_entry (htab->tls_get_addr)
|| h == (struct elf_link_hash_entry *) htab->tga_desc); || h == elf_hash_entry (htab->tga_desc));
} }
static bfd_boolean func_desc_adjust (struct elf_link_hash_entry *, void *); static bfd_boolean func_desc_adjust (struct elf_link_hash_entry *, void *);
@ -7856,7 +7862,7 @@ ppc64_elf_tls_setup (struct bfd_link_info *info)
if (tga_fd != NULL) if (tga_fd != NULL)
{ {
htab->tls_get_addr_fd = ppc_elf_hash_entry (opt_fd); htab->tls_get_addr_fd = ppc_elf_hash_entry (opt_fd);
tga = (struct elf_link_hash_entry *) htab->tls_get_addr; tga = elf_hash_entry (htab->tls_get_addr);
if (opt != NULL && tga != NULL) if (opt != NULL && tga != NULL)
{ {
tga->root.type = bfd_link_hash_indirect; tga->root.type = bfd_link_hash_indirect;
@ -7917,12 +7923,12 @@ ppc64_elf_tls_setup (struct bfd_link_info *info)
any of HASH1, HASH2, HASH3, or HASH4. */ any of HASH1, HASH2, HASH3, or HASH4. */
static bfd_boolean static bfd_boolean
branch_reloc_hash_match (const bfd *ibfd, branch_reloc_hash_match (bfd *ibfd,
const Elf_Internal_Rela *rel, Elf_Internal_Rela *rel,
const struct ppc_link_hash_entry *hash1, struct ppc_link_hash_entry *hash1,
const struct ppc_link_hash_entry *hash2, struct ppc_link_hash_entry *hash2,
const struct ppc_link_hash_entry *hash3, struct ppc_link_hash_entry *hash3,
const struct ppc_link_hash_entry *hash4) struct ppc_link_hash_entry *hash4)
{ {
Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (ibfd); Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (ibfd);
enum elf_ppc64_reloc_type r_type = ELF64_R_TYPE (rel->r_info); enum elf_ppc64_reloc_type r_type = ELF64_R_TYPE (rel->r_info);
@ -7935,10 +7941,10 @@ branch_reloc_hash_match (const bfd *ibfd,
h = sym_hashes[r_symndx - symtab_hdr->sh_info]; h = sym_hashes[r_symndx - symtab_hdr->sh_info];
h = elf_follow_link (h); h = elf_follow_link (h);
if (h == (struct elf_link_hash_entry *) hash1 if (h == elf_hash_entry (hash1)
|| h == (struct elf_link_hash_entry *) hash2 || h == elf_hash_entry (hash2)
|| h == (struct elf_link_hash_entry *) hash3 || h == elf_hash_entry (hash3)
|| h == (struct elf_link_hash_entry *) hash4) || h == elf_hash_entry (hash4))
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -9629,6 +9635,18 @@ ensure_undef_dynamic (struct bfd_link_info *info,
return TRUE; return TRUE;
} }
/* Choose whether to use htab->iplt or htab->pltlocal rather than the
usual htab->elf.splt section for a PLT entry. */
static inline
bfd_boolean use_local_plt (struct bfd_link_info *info,
struct elf_link_hash_entry *h)
{
return (h == NULL
|| h->dynindx == -1
|| !elf_hash_table (info)->dynamic_sections_created);
}
/* Allocate space in .plt, .got and associated reloc sections for /* Allocate space in .plt, .got and associated reloc sections for
dynamic relocs. */ dynamic relocs. */
@ -9818,8 +9836,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
for (pent = h->plt.plist; pent != NULL; pent = pent->next) for (pent = h->plt.plist; pent != NULL; pent = pent->next)
if (pent->plt.refcount > 0) if (pent->plt.refcount > 0)
{ {
if (!htab->elf.dynamic_sections_created if (use_local_plt (info, h))
|| h->dynindx == -1)
{ {
if (h->type == STT_GNU_IFUNC) if (h->type == STT_GNU_IFUNC)
{ {
@ -11703,9 +11720,7 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
abort (); abort ();
plt = htab->elf.splt; plt = htab->elf.splt;
if (!htab->elf.dynamic_sections_created if (use_local_plt (info, elf_hash_entry (stub_entry->h)))
|| stub_entry->h == NULL
|| stub_entry->h->elf.dynindx == -1)
{ {
if (stub_entry->symtype == STT_GNU_IFUNC) if (stub_entry->symtype == STT_GNU_IFUNC)
plt = htab->elf.iplt; plt = htab->elf.iplt;
@ -11837,9 +11852,7 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
abort (); abort ();
plt = htab->elf.splt; plt = htab->elf.splt;
if (!htab->elf.dynamic_sections_created if (use_local_plt (info, elf_hash_entry (stub_entry->h)))
|| stub_entry->h == NULL
|| stub_entry->h->elf.dynindx == -1)
{ {
if (stub_entry->symtype == STT_GNU_IFUNC) if (stub_entry->symtype == STT_GNU_IFUNC)
plt = htab->elf.iplt; plt = htab->elf.iplt;
@ -12208,9 +12221,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
abort (); abort ();
plt = htab->elf.splt; plt = htab->elf.splt;
if (!htab->elf.dynamic_sections_created if (use_local_plt (info, elf_hash_entry (stub_entry->h)))
|| stub_entry->h == NULL
|| stub_entry->h->elf.dynindx == -1)
{ {
if (stub_entry->symtype == STT_GNU_IFUNC) if (stub_entry->symtype == STT_GNU_IFUNC)
plt = htab->elf.iplt; plt = htab->elf.iplt;
@ -12292,9 +12303,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
if (targ >= (bfd_vma) -2) if (targ >= (bfd_vma) -2)
abort (); abort ();
plt = htab->elf.splt; plt = htab->elf.splt;
if (!htab->elf.dynamic_sections_created if (use_local_plt (info, elf_hash_entry (stub_entry->h)))
|| stub_entry->h == NULL
|| stub_entry->h->elf.dynindx == -1)
{ {
if (stub_entry->symtype == STT_GNU_IFUNC) if (stub_entry->symtype == STT_GNU_IFUNC)
plt = htab->elf.iplt; plt = htab->elf.iplt;
@ -14061,8 +14070,7 @@ build_global_entry_stubs_and_plt (struct elf_link_hash_entry *h, void *inf)
asection *plt, *relplt; asection *plt, *relplt;
bfd_byte *loc; bfd_byte *loc;
if (!htab->elf.dynamic_sections_created if (use_local_plt (info, h))
|| h->dynindx == -1)
{ {
if (!(h->def_regular if (!(h->def_regular
&& (h->root.type == bfd_link_hash_defined && (h->root.type == bfd_link_hash_defined
@ -14151,8 +14159,7 @@ build_global_entry_stubs_and_plt (struct elf_link_hash_entry *h, void *inf)
p = s->contents + h->root.u.def.value; p = s->contents + h->root.u.def.value;
plt = htab->elf.splt; plt = htab->elf.splt;
if (!htab->elf.dynamic_sections_created if (use_local_plt (info, h))
|| h->dynindx == -1)
{ {
if (h->type == STT_GNU_IFUNC) if (h->type == STT_GNU_IFUNC)
plt = htab->elf.iplt; plt = htab->elf.iplt;
@ -16490,9 +16497,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
bfd_vma got; bfd_vma got;
plt = htab->elf.splt; plt = htab->elf.splt;
if (!htab->elf.dynamic_sections_created if (use_local_plt (info, elf_hash_entry (h)))
|| h == NULL
|| h->elf.dynindx == -1)
{ {
if (h != NULL if (h != NULL
? h->elf.type == STT_GNU_IFUNC ? h->elf.type == STT_GNU_IFUNC