diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2018-11-28 03:18:01 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2018-11-28 03:18:01 +0000 |
| commit | 48c6c35dfdcdaae7bc6d9b5aa1425e5a52e4c3e6 (patch) | |
| tree | 74f2ae0bfe9da470e46dca295079ac8c87239b0f /libexec/ld.so/resolve.h | |
| parent | c202a55452845af3393a735943423d070a4c1d92 (diff) | |
Implement support for DT_GNU_HASH, taking all the interesting bits
from Matt Dillon's implementation in DragonFlyBSD commit 7629c631.
One difference is that as long as DT_HASH is still present, ld.so
will use that to get the total number of symbols rather than walking
the GNU hash chains. Note that the GPLv2 binutils we have doesn't
support DT_GNU_HASH, so this only helps archs were lld is used.
ok kettenis@ mpi@
Diffstat (limited to 'libexec/ld.so/resolve.h')
| -rw-r--r-- | libexec/ld.so/resolve.h | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/libexec/ld.so/resolve.h b/libexec/ld.so/resolve.h index ff0738dfa6a..b5c6629d889 100644 --- a/libexec/ld.so/resolve.h +++ b/libexec/ld.so/resolve.h @@ -1,4 +1,4 @@ -/* $OpenBSD: resolve.h,v 1.86 2018/11/16 21:15:47 guenther Exp $ */ +/* $OpenBSD: resolve.h,v 1.87 2018/11/28 03:18:00 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -119,6 +119,7 @@ struct elf_object { #define STAT_UNLOADED 0x20 #define STAT_NODELETE 0x40 #define STAT_VISITED 0x80 +#define STAT_GNU_HASH 0x100 Elf_Phdr *phdrp; int phdrc; @@ -130,10 +131,34 @@ struct elf_object { #define OBJTYPE_DLO 4 int obj_flags; /* c.f. <sys/exec_elf.h> DF_1_* */ - Elf_Word *buckets; + /* shared by ELF and GNU hash */ u_int32_t nbuckets; - Elf_Word *chains; - u_int32_t nchains; + u_int32_t nchains; /* really, number of symbols */ + union { + struct { + /* specific to ELF hash */ + const Elf_Word *buckets; + const Elf_Word *chains; + } u_elf; + struct { + /* specific to GNU hash */ + const Elf32_Word *buckets; + const Elf32_Word *chains; + const Elf_Addr *bloom; + Elf32_Word mask_bm; + Elf32_Word shift2; + Elf32_Word symndx; + } u_gnu; + } hash_u; +#define buckets_elf hash_u.u_elf.buckets +#define chains_elf hash_u.u_elf.chains +#define buckets_gnu hash_u.u_gnu.buckets +#define chains_gnu hash_u.u_gnu.chains +#define bloom_gnu hash_u.u_gnu.bloom +#define mask_bm_gnu hash_u.u_gnu.mask_bm +#define shift2_gnu hash_u.u_gnu.shift2 +#define symndx_gnu hash_u.u_gnu.symndx + Elf_Dyn *dynamic; TAILQ_HEAD(,dep_node) child_list; /* direct dep libs of object */ |