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

ld.so: Handle local TLSDESC entry from libstdc++?

Browse Source
This commit is contained in:
K. Lange 2022-10-26 17:39:09 +09:00
parent 09af9ac25a
commit d996223d55
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
linker/linker.c
View File

@ -578,12 +578,18 @@ static int object_relocate(elf_t * object) {
memcpy((void *)(table->r_offset + object->base), &x, sizeof(uintptr_t)); memcpy((void *)(table->r_offset + object->base), &x, sizeof(uintptr_t));
break; break;
case 1031: { case 1031: {
x += *((ssize_t *)(table->r_offset + object->base)); if (symbol) {
if (!hashmap_has(tls_map, symname)) { if (!hashmap_has(tls_map, symname)) {
fprintf(stderr, "Don't know where to get %s from TLS\n", symname); fprintf(stderr, "Warning: Don't know where to get %s (symbol %d) from TLS\n", symname, symbol);
exit(1); break;
}
x += *((ssize_t *)(table->r_offset + object->base));
x += (size_t)hashmap_get(tls_map, symname);
} else {
/* local tls descriptor? no symbol? idk what to do with this, hope it works */
x = current_tls_offset;
current_tls_offset += 8*4; /* idk, alignment I guess */
} }
x += (size_t)hashmap_get(tls_map, symname);
uintptr_t func = (uintptr_t)&__tlsdesc_static; uintptr_t func = (uintptr_t)&__tlsdesc_static;
memcpy((void *)(table->r_offset + object->base), &func, sizeof(uintptr_t)); memcpy((void *)(table->r_offset + object->base), &func, sizeof(uintptr_t));
memcpy((void *)(table->r_offset + object->base + sizeof(uintptr_t)), &x, sizeof(uintptr_t)); memcpy((void *)(table->r_offset + object->base + sizeof(uintptr_t)), &x, sizeof(uintptr_t));