espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-10-13 02:45:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

* elflink.c (elf_link_add_object_symbols): Don't save symbol

Browse Source 
hashes around loading as-needed library.  Zero them on allocation,
	and restore to initial all-zero state if library not needed.
	Arrange to reuse hashes if we load library again later.
This commit is contained in:
Alan Modra
2013-05-06 08:45:40 +00:00
parent a9c0e92d1b
commit f45794cb51
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2013-05-06 Alan Modra <amodra@gmail.com>
* elflink.c (elf_link_add_object_symbols): Don't save symbol
hashes around loading as-needed library. Zero them on allocation,
and restore to initial all-zero state if library not needed.
Arrange to reuse hashes if we load library again later.
2013-05-04 Richard Sandiford <rdsandiford@googlemail.com> 2013-05-04 Richard Sandiford <rdsandiford@googlemail.com>
* elf32-mips.c (elf_mips_copy_howto, elf_mips_jump_slot_howto): * elf32-mips.c (elf_mips_copy_howto, elf_mips_jump_slot_howto):

27
bfd/elflink.c
View File

@ -3338,14 +3338,12 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
unsigned int old_size = 0; unsigned int old_size = 0;
unsigned int old_count = 0; unsigned int old_count = 0;
void *old_tab = NULL; void *old_tab = NULL;
void *old_hash;
void *old_ent; void *old_ent;
struct bfd_link_hash_entry *old_undefs = NULL; struct bfd_link_hash_entry *old_undefs = NULL;
struct bfd_link_hash_entry *old_undefs_tail = NULL; struct bfd_link_hash_entry *old_undefs_tail = NULL;
long old_dynsymcount = 0; long old_dynsymcount = 0;
bfd_size_type old_dynstr_size = 0; bfd_size_type old_dynstr_size = 0;
size_t tabsize = 0; size_t tabsize = 0;
size_t hashsize = 0;
htab = elf_hash_table (info); htab = elf_hash_table (info);
bed = get_elf_backend_data (abfd); bed = get_elf_backend_data (abfd);
@ -3700,8 +3698,8 @@ error_free_dyn:
extsymoff = hdr->sh_info; extsymoff = hdr->sh_info;
} }
sym_hash = NULL; sym_hash = elf_sym_hashes (abfd);
if (extsymcount != 0) if (sym_hash == NULL && extsymcount != 0)
{ {
isymbuf = bfd_elf_get_elf_syms (abfd, hdr, extsymcount, extsymoff, isymbuf = bfd_elf_get_elf_syms (abfd, hdr, extsymcount, extsymoff,
NULL, NULL, NULL); NULL, NULL, NULL);
@ -3711,7 +3709,7 @@ error_free_dyn:
/* We store a pointer to the hash table entry for each external /* We store a pointer to the hash table entry for each external
symbol. */ symbol. */
amt = extsymcount * sizeof (struct elf_link_hash_entry *); amt = extsymcount * sizeof (struct elf_link_hash_entry *);
sym_hash = (struct elf_link_hash_entry **) bfd_alloc (abfd, amt); sym_hash = (struct elf_link_hash_entry **) bfd_zalloc (abfd, amt);
if (sym_hash == NULL) if (sym_hash == NULL)
goto error_free_sym; goto error_free_sym;
elf_sym_hashes (abfd) = sym_hash; elf_sym_hashes (abfd) = sym_hash;
@ -3764,8 +3762,7 @@ error_free_dyn:
} }
tabsize = htab->root.table.size * sizeof (struct bfd_hash_entry *); tabsize = htab->root.table.size * sizeof (struct bfd_hash_entry *);
hashsize = extsymcount * sizeof (struct elf_link_hash_entry *); old_tab = bfd_malloc (tabsize + entsize);
old_tab = bfd_malloc (tabsize + entsize + hashsize);
if (old_tab == NULL) if (old_tab == NULL)
goto error_free_vers; goto error_free_vers;
@ -3781,12 +3778,10 @@ error_free_dyn:
notice_as_needed, 0, NULL)) notice_as_needed, 0, NULL))
goto error_free_vers; goto error_free_vers;
/* Clone the symbol table and sym hashes. Remember some /* Clone the symbol table. Remember some pointers into the
pointers into the symbol table, and dynamic symbol count. */ symbol table, and dynamic symbol count. */
old_hash = (char *) old_tab + tabsize; old_ent = (char *) old_tab + tabsize;
old_ent = (char *) old_hash + hashsize;
memcpy (old_tab, htab->root.table.table, tabsize); memcpy (old_tab, htab->root.table.table, tabsize);
memcpy (old_hash, sym_hash, hashsize);
old_undefs = htab->root.undefs; old_undefs = htab->root.undefs;
old_undefs_tail = htab->root.undefs_tail; old_undefs_tail = htab->root.undefs_tail;
old_table = htab->root.table.table; old_table = htab->root.table.table;
@ -3843,7 +3838,6 @@ error_free_dyn:
flags = BSF_NO_FLAGS; flags = BSF_NO_FLAGS;
sec = NULL; sec = NULL;
value = isym->st_value; value = isym->st_value;
*sym_hash = NULL;
common = bed->common_definition (isym); common = bed->common_definition (isym);
bind = ELF_ST_BIND (isym->st_info); bind = ELF_ST_BIND (isym->st_info);
@ -4477,14 +4471,13 @@ error_free_dyn:
/* Restore the symbol table. */ /* Restore the symbol table. */
if (bed->as_needed_cleanup) if (bed->as_needed_cleanup)
(*bed->as_needed_cleanup) (abfd, info); (*bed->as_needed_cleanup) (abfd, info);
old_hash = (char *) old_tab + tabsize; old_ent = (char *) old_tab + tabsize;
old_ent = (char *) old_hash + hashsize; memset (elf_sym_hashes (abfd), 0,
sym_hash = elf_sym_hashes (abfd); extsymcount * sizeof (struct elf_link_hash_entry *));
htab->root.table.table = old_table; htab->root.table.table = old_table;
htab->root.table.size = old_size; htab->root.table.size = old_size;
htab->root.table.count = old_count; htab->root.table.count = old_count;
memcpy (htab->root.table.table, old_tab, tabsize); memcpy (htab->root.table.table, old_tab, tabsize);
memcpy (sym_hash, old_hash, hashsize);
htab->root.undefs = old_undefs; htab->root.undefs = old_undefs;
htab->root.undefs_tail = old_undefs_tail; htab->root.undefs_tail = old_undefs_tail;
_bfd_elf_strtab_restore_size (htab->dynstr, old_dynstr_size); _bfd_elf_strtab_restore_size (htab->dynstr, old_dynstr_size);