RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix dynamic linker not to depend on DYNAMIC ptr in 0th entry of GOT 

this fixes an issue using gold instead of gnu ld for linking. it also
should eliminate the need of the startup code to even load/pass the
got address to the dynamic linker.

based on patch submitted by sh4rm4 with minor cosmetic changes.

further cleanup will follow.
This commit is contained in:
Rich Felker 2012-01-20 11:14:27 -05:00
parent 07065210ca
commit 0b6dc09744
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ldso/dynlink.c
View File

@ -467,6 +467,7 @@ void *__dynlink(int argc, char **argv, size_t *got)
size_t i; size_t i;
Phdr *phdr; Phdr *phdr;
Ehdr *ehdr; Ehdr *ehdr;
size_t *lib_dynv;
static struct dso builtin_dsos[3]; static struct dso builtin_dsos[3];
struct dso *const app = builtin_dsos+0; struct dso *const app = builtin_dsos+0;
struct dso *const lib = builtin_dsos+1; struct dso *const lib = builtin_dsos+1;
@ -498,8 +499,16 @@ void *__dynlink(int argc, char **argv, size_t *got)
} }
} }
/* Relocate ldso's DYNAMIC pointer and load vector */ /* Find the dynamic linker's DYNAMIC section and decode it */
decode_vec((void *)(got[0] += aux[AT_BASE]), lib_dyn, DYN_CNT); ehdr = (void *)aux[AT_BASE];
phdr = (void *)(aux[AT_BASE] + ehdr->e_phoff);
for (i=ehdr->e_phnum; i--; phdr=(void *)((char *)phdr + ehdr->e_phentsize)) {
if (phdr->p_type == PT_DYNAMIC) {
lib_dynv = (void *)(aux[AT_BASE] + phdr->p_vaddr);
decode_vec(lib_dynv, lib_dyn, DYN_CNT);
break;
}
}
/* Find the program image's DYNAMIC section and decode it */ /* Find the program image's DYNAMIC section and decode it */
phdr = (void *)aux[AT_PHDR]; phdr = (void *)aux[AT_PHDR];
@ -526,7 +535,7 @@ void *__dynlink(int argc, char **argv, size_t *got)
.strings = (void *)(aux[AT_BASE]+lib_dyn[DT_STRTAB]), .strings = (void *)(aux[AT_BASE]+lib_dyn[DT_STRTAB]),
.hashtab = (void *)(aux[AT_BASE]+lib_dyn[DT_HASH]), .hashtab = (void *)(aux[AT_BASE]+lib_dyn[DT_HASH]),
.syms = (void *)(aux[AT_BASE]+lib_dyn[DT_SYMTAB]), .syms = (void *)(aux[AT_BASE]+lib_dyn[DT_SYMTAB]),
.dynv = (void *)(got[0]), .dynv = lib_dynv,
.name = "libc.so", .name = "libc.so",
.global = 1, .global = 1,
.relocated = 1 .relocated = 1