diff options
| author | Rich Felker <dalias@aerifal.cx> | 2016-11-11 12:30:24 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2016-11-11 12:46:06 -0500 |
| commit | b418ea1b66d0d5a08640d4edf3b65d4619c6ef7f (patch) | |
| tree | f4b2a1cc89e1c5fce77fd13cd0821eb2178c1f25 | |
| parent | 4078a5c31fa67987051c2180db7a07702534032f (diff) | |
| download | musl-b418ea1b66d0d5a08640d4edf3b65d4619c6ef7f.tar.gz | |
generalize ELF hash table types not to assume 32-bit entries
alpha and s390x gratuitously use 64-bit entries (wasting 2x space and
cache utilization) despite the values always being 32-bit.
based on patch by Bobby Bingham, with changes suggested by Alexander
Monakov to use the public Elf_Symndx type from link.h (and make it
properly variable by arch) rather than adding new internal
infrastructure for handling the type.
| -rw-r--r-- | arch/generic/bits/link.h | 1 | ||||
| -rw-r--r-- | include/link.h | 3 | ||||
| -rw-r--r-- | ldso/dynlink.c | 4 | ||||
| -rw-r--r-- | src/internal/vdso.c | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/arch/generic/bits/link.h b/arch/generic/bits/link.h new file mode 100644 index 00000000..4a94d8f8 --- /dev/null +++ b/arch/generic/bits/link.h @@ -0,0 +1 @@ +typedef uint32_t Elf_Symndx; diff --git a/include/link.h b/include/link.h index 9349cddd..81501859 100644 --- a/include/link.h +++ b/include/link.h @@ -16,8 +16,7 @@ extern "C" { #define ElfW(type) Elf32_ ## type #endif -/* this is the same everywhere except alpha and s390 */ -typedef uint32_t Elf_Symndx; +#include <bits/link.h> struct dl_phdr_info { ElfW(Addr) dlpi_addr; diff --git a/ldso/dynlink.c b/ldso/dynlink.c index acb73bc2..ad49cac2 100644 --- a/ldso/dynlink.c +++ b/ldso/dynlink.c @@ -54,7 +54,7 @@ struct dso { size_t phentsize; int refcnt; Sym *syms; - uint32_t *hashtab; + Elf_Symndx *hashtab; uint32_t *ghashtab; int16_t *versym; char *strings; @@ -206,7 +206,7 @@ static Sym *sysv_lookup(const char *s, uint32_t h, struct dso *dso) { size_t i; Sym *syms = dso->syms; - uint32_t *hashtab = dso->hashtab; + Elf_Symndx *hashtab = dso->hashtab; char *strings = dso->strings; for (i=hashtab[2+h%hashtab[0]]; i; i=hashtab[2+hashtab[0]+i]) { if ((!dso->versym || dso->versym[i] >= 0) diff --git a/src/internal/vdso.c b/src/internal/vdso.c index 6ae0212e..a4862171 100644 --- a/src/internal/vdso.c +++ b/src/internal/vdso.c @@ -1,4 +1,5 @@ #include <elf.h> +#include <link.h> #include <limits.h> #include <stdint.h> #include <string.h> @@ -57,7 +58,7 @@ void *__vdsosym(const char *vername, const char *name) char *strings = 0; Sym *syms = 0; - uint32_t *hashtab = 0; + Elf_Symndx *hashtab = 0; uint16_t *versym = 0; Verdef *verdef = 0; |