diff options
author | Ulrich Drepper <drepper@redhat.com> | 2006-07-10 21:59:43 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2006-07-10 21:59:43 +0000 |
commit | 871b91589bf4f6dfe19d5987b0a05bd7cf936ecc (patch) | |
tree | e50affec0ae060520fbfac19071ee0bfc4348f31 /include | |
parent | f3be81a91cdd1b42c47e4d8501dd96d0f1666520 (diff) | |
download | glibc-871b91589bf4f6dfe19d5987b0a05bd7cf936ecc.tar.gz glibc-871b91589bf4f6dfe19d5987b0a05bd7cf936ecc.tar.xz glibc-871b91589bf4f6dfe19d5987b0a05bd7cf936ecc.zip |
* elf/dl-lookup.c (dl_new_hash): New functions. cvs/fedora-glibc-20060710T2206
(_dl_lookup_symbol_x): Rename hash to old_hash and don't compute value here. Compute new-style hash value. Pass new hash value and reference to variable with the old value to do_lookup_x. (_dl_setup_hash): If DT_GNU_HASH is defined, use it and not old-style hash table. (_dl_debug_bindings): Pass new hash value and reference to variable with the old value to do_lookup_x. * elf/do-lookup.h (do_lookup_x): Accept additional parameter with new-style hash value and change old-style hash value parameter to be a reference. Reoganize functions to determine whether new-style hash table is available. Only fall back on old-style table. If old-style hash value is needed, compute it here. * elf/dynamic-link.h (elf_get_dynamic_info): Relocate DT_GNU_HASH entry. * elf/elf.h: Define SHT_GNU_HASH, DT_GNU_HASH, DT_TLSDEC_PLT, DT_TLSDEC_GOT. Adjust DT_ADDRNUM. * include/link.h (struct link_map): Add l_gnu_bitmask_idxbits, l_gnu_shift, l_gnu_bitmask, l_gnu_buckets and l_gnu_chain_zero. * Makeconfig: If linker supports --hash-style option add it to all linker command lines to build DSOs. * config.make.in: Define have-hash-style. * configure.in: Test whether linker supports --hash-style option. * elf/dl-misc.c (_dl_name_match_p): Make MAP parameter const. * sysdeps/generic/ldsodefs.h: Adjust prototype.
Diffstat (limited to 'include')
-rw-r--r-- | include/link.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/link.h b/include/link.h index 3079ae8739..9947ee7813 100644 --- a/include/link.h +++ b/include/link.h @@ -124,7 +124,7 @@ struct link_map const ElfW(Phdr) *l_phdr; /* Pointer to program header table in core. */ ElfW(Addr) l_entry; /* Entry point location. */ ElfW(Half) l_phnum; /* Number of program header entries. */ - ElfW(Half) l_ldnum; /* Number of dynamic segment entries. */ + ElfW(Half) l_ldnum; /* Number of dynamic segment entries. */ /* Array of DT_NEEDED dependencies and their dependencies, in dependency order for symbol lookup (with and without @@ -141,7 +141,19 @@ struct link_map /* Symbol hash table. */ Elf_Symndx l_nbuckets; - const Elf_Symndx *l_buckets, *l_chain; + Elf32_Word l_gnu_bitmask_idxbits; + Elf32_Word l_gnu_shift; + const ElfW(Addr) *l_gnu_bitmask; + union + { + const Elf32_Word *l_gnu_buckets; + const Elf_Symndx *l_chain; + }; + union + { + const Elf32_Word *l_gnu_chain_zero; + const Elf_Symndx *l_buckets; + }; unsigned int l_direct_opencount; /* Reference count for dlopen/dlclose. */ enum /* Where this object came from. */ |