Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aarch64: fixup linker TLS bindings

Browse Source
This commit is contained in:
K. Lange 2022-02-01 06:54:00 +09:00
parent f0d7ed7743
commit bbd9bc7b5c
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
linker/linker.c
View File

@ -431,16 +431,22 @@ static int object_relocate(elf_t * object) {
while (i < object->dyn_symbol_table_size) { while (i < object->dyn_symbol_table_size) {
char * symname = (char *)((uintptr_t)object->dyn_string_table + table->st_name); char * symname = (char *)((uintptr_t)object->dyn_string_table + table->st_name);
int is_tls = (table->st_info & 0xF) == 6;
/* If we haven't added this symbol to our symbol table, do so now. */ /* If we haven't added this symbol to our symbol table, do so now. */
if (table->st_shndx) { if (table->st_shndx) {
if (!hashmap_has(dumb_symbol_table, symname)) { if (!hashmap_has(dumb_symbol_table, symname)) {
hashmap_set(dumb_symbol_table, symname, (void*)(table->st_value + object->base)); hashmap_set(dumb_symbol_table, symname, (void*)(table->st_value + (is_tls ? 0 : object->base)));
table->st_value = table->st_value + object->base; table->st_value = table->st_value + (is_tls ? 0 : object->base);
} else { } else {
table->st_value = (uintptr_t)hashmap_get(dumb_symbol_table, symname); table->st_value = (uintptr_t)hashmap_get(dumb_symbol_table, symname);
} }
} else { } else {
table->st_value = table->st_value + object->base; if (hashmap_has(dumb_symbol_table, symname)) {
table->st_value = (uintptr_t)hashmap_get(dumb_symbol_table, symname);
} else {
table->st_value = table->st_value + (is_tls ? 0 : object->base);
}
} }
table++; table++;
@ -552,7 +558,9 @@ static int object_relocate(elf_t * object) {
current_tls_offset += sym->st_size; /* TODO alignment restrictions */ current_tls_offset += sym->st_size; /* TODO alignment restrictions */
#endif #endif
} else { } else {
x += (size_t)hashmap_get(tls_map, symname); size_t val = (size_t)hashmap_get(tls_map, symname);
TRACE_LD("add %#zx to %zx\n", val, x);
x += val;
} }
memcpy((void *)(table->r_offset + object->base), &x, sizeof(uintptr_t)); memcpy((void *)(table->r_offset + object->base), &x, sizeof(uintptr_t));
break; break;
@ -789,12 +797,10 @@ static elf_t * preload(hashmap_t * libs, list_t * load_libs, char * lib_name) {
/* Mark this library available */ /* Mark this library available */
hashmap_set(libs, lib_name, lib); hashmap_set(libs, lib_name, lib);
TRACE_LD("Loading %s at 0x%x", lib_name, end_addr);
/* Adjust dumb allocator */ /* Adjust dumb allocator */
while (end_addr & 0xFFF) { end_addr = (end_addr + 0xFFF) & ~(0xFFFUL);
end_addr++;
} TRACE_LD("Loading %s at 0x%x", lib_name, end_addr);
/* Load PHDRs */ /* Load PHDRs */
end_addr = object_load(lib, end_addr); end_addr = object_load(lib, end_addr);