semios/semi-libc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

further refactoring of dynamic linker load address computations

Browse Source 
these are in do_relocs. the first one was omitted in commit
301335a80b because it slightly changes
code (using dso->base rather than cached local var base) and would
have prevented easy verification. the other was an oversight.
This commit is contained in:
Rich Felker
2015-09-17 17:50:43 +00:00
parent 301335a80b
commit a735f53e6a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ldso/dynlink.c
+2 -2
View File
@@ -288,7 +288,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
type = R_TYPE(rel[1]); type = R_TYPE(rel[1]);
if (type == REL_NONE) continue; if (type == REL_NONE) continue;
sym_index = R_SYM(rel[1]); sym_index = R_SYM(rel[1]);
reloc_addr = (void *)(base + rel[0]); reloc_addr = laddr(dso, rel[0]);
if (sym_index) { if (sym_index) {
sym = syms + sym_index; sym = syms + sym_index;
name = strings + sym->st_name; name = strings + sym->st_name;
@@ -322,7 +322,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
addend = *reloc_addr; addend = *reloc_addr;
} }
sym_val = def.sym ? (size_t)def.dso->base+def.sym->st_value : 0; sym_val = def.sym ? (size_t)laddr(def.dso, def.sym->st_value) : 0;
tls_val = def.sym ? def.sym->st_value : 0; tls_val = def.sym ? def.sym->st_value : 0;
switch(type) { switch(type) {