espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-26 22:07:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

* elf64-ppc.c (allocate_dynrelocs): Remove unused got structs here..

Browse Source 
(ppc64_elf_size_dynamic_sections): ..and here..
	(merge_got_entries): ..rather than here.
This commit is contained in:
Alan Modra
2010-02-08 14:09:25 +00:00
parent 33c0ec9de7
commit 0b8bcf0ddb
2 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2010-02-09 Alan Modra <amodra@gmail.com>
* elf64-ppc.c (allocate_dynrelocs): Remove unused got structs here..
(ppc64_elf_size_dynamic_sections): ..and here..
(merge_got_entries): ..rather than here.
2010-02-09 Alan Modra <amodra@gmail.com> 2010-02-09 Alan Modra <amodra@gmail.com>
* elf64-ppc.c (struct ppc_link_hash_table): Add do_multi_toc. * elf64-ppc.c (struct ppc_link_hash_table): Add do_multi_toc.

56
bfd/elf64-ppc.c
View File

@ -8317,7 +8317,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
asection *s; asection *s;
struct ppc_link_hash_entry *eh; struct ppc_link_hash_entry *eh;
struct ppc_dyn_relocs *p; struct ppc_dyn_relocs *p;
struct got_entry *gent; struct got_entry **pgent, *gent;
if (h->root.type == bfd_link_hash_indirect) if (h->root.type == bfd_link_hash_indirect)
return TRUE; return TRUE;
@ -8416,7 +8416,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
gent->tls_type = TLS_TLS | TLS_TPREL; gent->tls_type = TLS_TLS | TLS_TPREL;
} }
for (gent = h->got.glist; gent != NULL; gent = gent->next) pgent = &h->got.glist;
while ((gent = *pgent) != NULL)
if (gent->got.refcount > 0) if (gent->got.refcount > 0)
{ {
/* Make sure this symbol is output as a dynamic symbol. /* Make sure this symbol is output as a dynamic symbol.
@ -8435,7 +8436,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
&& !h->def_dynamic) && !h->def_dynamic)
{ {
ppc64_tlsld_got (gent->owner)->got.refcount += 1; ppc64_tlsld_got (gent->owner)->got.refcount += 1;
gent->got.offset = (bfd_vma) -1; *pgent = gent->next;
continue; continue;
} }
@ -8443,9 +8444,10 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
abort (); abort ();
allocate_got (h, info, gent); allocate_got (h, info, gent);
pgent = &gent->next;
} }
else else
gent->got.offset = (bfd_vma) -1; *pgent = gent->next;
if (eh->dyn_relocs == NULL if (eh->dyn_relocs == NULL
|| (!htab->elf.dynamic_sections_created || (!htab->elf.dynamic_sections_created
@ -8663,15 +8665,16 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
srel = ppc64_elf_tdata (ibfd)->relgot; srel = ppc64_elf_tdata (ibfd)->relgot;
for (; lgot_ents < end_lgot_ents; ++lgot_ents, ++lgot_masks) for (; lgot_ents < end_lgot_ents; ++lgot_ents, ++lgot_masks)
{ {
struct got_entry *ent; struct got_entry **pent, *ent;
for (ent = *lgot_ents; ent != NULL; ent = ent->next) pent = lgot_ents;
while ((ent = *pent) != NULL)
if (ent->got.refcount > 0) if (ent->got.refcount > 0)
{ {
if ((ent->tls_type & *lgot_masks & TLS_LD) != 0) if ((ent->tls_type & *lgot_masks & TLS_LD) != 0)
{ {
ppc64_tlsld_got (ibfd)->got.refcount += 1; ppc64_tlsld_got (ibfd)->got.refcount += 1;
ent->got.offset = (bfd_vma) -1; *pent = ent->next;
} }
else else
{ {
@ -8689,10 +8692,11 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
htab->got_reli_size htab->got_reli_size
+= num * sizeof (Elf64_External_Rela); += num * sizeof (Elf64_External_Rela);
} }
pent = &ent->next;
} }
} }
else else
ent->got.offset = (bfd_vma) -1; *pent = ent->next;
} }
/* Allocate space for calls to local STT_GNU_IFUNC syms in .iplt. */ /* Allocate space for calls to local STT_GNU_IFUNC syms in .iplt. */
@ -9848,36 +9852,24 @@ ppc64_elf_next_toc_section (struct bfd_link_info *info, asection *isec)
return TRUE; return TRUE;
} }
/* This function removes unneeded got entries (those with got.offset == -1) /* This function merges got entries in the same toc group. */
and merges entries in the same toc group. */
static void static void
merge_got_entries (struct got_entry **pent) merge_got_entries (struct got_entry **pent)
{ {
struct got_entry *ent, *ent2; struct got_entry *ent, *ent2;
while ((ent = *pent) != NULL) for (ent = *pent; ent != NULL; ent = ent->next)
{ if (!ent->is_indirect)
if (!ent->is_indirect) for (ent2 = ent->next; ent2 != NULL; ent2 = ent2->next)
{ if (!ent2->is_indirect
if (ent->got.offset == (bfd_vma) -1) && ent2->addend == ent->addend
{ && ent2->tls_type == ent->tls_type
*pent = ent->next; && elf_gp (ent2->owner) == elf_gp (ent->owner))
continue; {
} ent2->is_indirect = TRUE;
for (ent2 = ent->next; ent2 != NULL; ent2 = ent2->next) ent2->got.ent = ent;
if (!ent2->is_indirect }
&& ent2->got.offset != (bfd_vma) -1
&& ent2->addend == ent->addend
&& ent2->tls_type == ent->tls_type
&& elf_gp (ent2->owner) == elf_gp (ent->owner))
{
ent2->is_indirect = TRUE;
ent2->got.ent = ent;
}
}
pent = &ent->next;
}
} }
/* Called via elf_link_hash_traverse to merge GOT entries for global /* Called via elf_link_hash_traverse to merge GOT entries for global