mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-21 01:12:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR29540, R_PPC64_NONE in .rela.dyn when linking Linux vdso

Browse Source 
PR 29540
	* elf64-ppc.c (allocate_dynrelocs): Don't alloc space for relocs
	against discarded sections.
	(ppc64_elf_size_dynamic_sections): Use standard test for discarded
	sections.
	* elf32-ppc.c (allocate_dynrelocs): Don't alloc space for relocs
	against discarded sections.
	(ppc_elf_size_dynamic_sections): Use standard test for discarded
	sections.
This commit is contained in:
Alan Modra 2022-09-10 12:58:44 +09:30
parent 620fe92831
commit 365bf300da
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bfd/elf32-ppc.c
View File

@ -5268,12 +5268,13 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
/* Allocate space. */
for (p = h->dyn_relocs; p != NULL; p = p->next)
{
asection *sreloc = elf_section_data (p->sec)->sreloc;
if (eh->elf.type == STT_GNU_IFUNC)
sreloc = htab->elf.irelplt;
sreloc->size += p->count * sizeof (Elf32_External_Rela);
}
if (!discarded_section (p->sec))
{
asection *sreloc = elf_section_data (p->sec)->sreloc;
if (eh->elf.type == STT_GNU_IFUNC)
sreloc = htab->elf.irelplt;
sreloc->size += p->count * sizeof (Elf32_External_Rela);
}
/* Handle PLT relocs. Done last, after dynindx has settled.
We might need a PLT entry when the symbol
@ -5535,8 +5536,7 @@ ppc_elf_size_dynamic_sections (bfd *output_bfd,
p != NULL;
p = p->next)
{
if (!bfd_is_abs_section (p->sec)
&& bfd_is_abs_section (p->sec->output_section))
if (discarded_section (p->sec))
{
/* Input section has been discarded, either because
it is a copy of a linkonce section or due to

32
bfd/elf64-ppc.c
View File

@ -10000,20 +10000,21 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
/* Finally, allocate space. */
for (p = (struct ppc_dyn_relocs *) h->dyn_relocs; p != NULL; p = p->next)
{
unsigned int count;
asection *sreloc = elf_section_data (p->sec)->sreloc;
if (eh->elf.type == STT_GNU_IFUNC)
sreloc = htab->elf.irelplt;
count = p->count;
if (info->enable_dt_relr
&& ((!NO_OPD_RELOCS
&& ppc64_elf_section_data (p->sec)->sec_type == sec_opd)
|| (eh->elf.type != STT_GNU_IFUNC
&& SYMBOL_REFERENCES_LOCAL (info, h))))
count -= p->rel_count;
sreloc->size += count * sizeof (Elf64_External_Rela);
}
if (!discarded_section (p->sec))
{
unsigned int count;
asection *sreloc = elf_section_data (p->sec)->sreloc;
if (eh->elf.type == STT_GNU_IFUNC)
sreloc = htab->elf.irelplt;
count = p->count;
if (info->enable_dt_relr
&& ((!NO_OPD_RELOCS
&& ppc64_elf_section_data (p->sec)->sec_type == sec_opd)
|| (eh->elf.type != STT_GNU_IFUNC
&& SYMBOL_REFERENCES_LOCAL (info, h))))
count -= p->rel_count;
sreloc->size += count * sizeof (Elf64_External_Rela);
}
}
/* We might need a PLT entry when the symbol
@ -10248,8 +10249,7 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd,
for (p = elf_section_data (s)->local_dynrel; p != NULL; p = p->next)
{
if (!bfd_is_abs_section (p->sec)
&& bfd_is_abs_section (p->sec->output_section))
if (discarded_section (p->sec))
{
/* Input section has been discarded, either because
it is a copy of a linkonce section or due to