FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* elflink.c (elf_link_add_object_symbols): Save and restore

Browse source 
struct bfd_hash_table table, size and count fields for
	as-needed libs.
This commit is contained in:
Alan Modra 2006-06-13 14:49:54 +00:00
parent 54d1c879c1
commit 4f87808cf3
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bfd/ChangeLog
View file

@ -1,3 +1,9 @@
2006-06-14 Alan Modra <amodra@bigpond.net.au>
* elflink.c (elf_link_add_object_symbols): Save and restore
struct bfd_hash_table table, size and count fields for
as-needed libs.
2006-06-12 Thiemo Seufer <ths@mips.com> 2006-06-12 Thiemo Seufer <ths@mips.com>
* elf32-mips.c: Expand comment about ABI-mandated pagesize values. * elf32-mips.c: Expand comment about ABI-mandated pagesize values.

9
bfd/elflink.c
View file

@ -3080,6 +3080,9 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
struct elf_link_hash_table *htab; struct elf_link_hash_table *htab;
bfd_size_type amt; bfd_size_type amt;
void *alloc_mark = NULL; void *alloc_mark = NULL;
struct bfd_hash_entry **old_table = NULL;
unsigned int old_size = 0;
unsigned int old_count = 0;
void *old_tab = NULL; void *old_tab = NULL;
void *old_hash; void *old_hash;
void *old_ent; void *old_ent;
@ -3504,6 +3507,9 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
memcpy (old_hash, sym_hash, hashsize); 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_size = htab->root.table.size;
old_count = htab->root.table.count;
old_dynsymcount = htab->dynsymcount; old_dynsymcount = htab->dynsymcount;
for (i = 0; i < htab->root.table.size; i++) for (i = 0; i < htab->root.table.size; i++)
@ -4151,6 +4157,9 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
old_hash = (char *) old_tab + tabsize; old_hash = (char *) old_tab + tabsize;
old_ent = (char *) old_hash + hashsize; old_ent = (char *) old_hash + hashsize;
sym_hash = elf_sym_hashes (abfd); sym_hash = elf_sym_hashes (abfd);
htab->root.table.table = old_table;
htab->root.table.size = old_size;
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); memcpy (sym_hash, old_hash, hashsize);
htab->root.undefs = old_undefs; htab->root.undefs = old_undefs;