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

x86_64: Put TLS data after the self-pointer, like we started doing in aarch64

This commit is contained in:
K. Lange 2022-02-01 07:55:11 +09:00
parent bf40d8f289
commit 2c1f2b942d
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/pthread/pthread.c
View File

@ -43,14 +43,9 @@ void * __tls_get_addr(void* input) {
void __make_tls(void) {
char * tlsSpace = valloc(4096);
memset(tlsSpace, 0x0, 4096);
#if defined(__x86_64__)
/* self-pointer at end */
char ** tlsSelf = (char **)(tlsSpace + 4096 - sizeof(char *));
#elif defined(__aarch64__)
/* self-pointer start? */
char ** tlsSelf = (char **)(tlsSpace);
*tlsSelf = (char*)tlsSelf;
#endif
sysfunc(TOARU_SYS_FUNC_SETGSBASE, (char*[]){(char*)tlsSelf});
}

14
linker/linker.c
View File

@ -509,16 +509,16 @@ static int object_relocate(elf_t * object) {
memcpy((void *)(table->r_offset + object->base), (void *)x, sym->st_size);
break;
case R_X86_64_TPOFF64:
x = *((ssize_t *)(table->r_offset + object->base));
x += *((ssize_t *)(table->r_offset + object->base));
if (!hashmap_has(tls_map, symname)) {
if (!sym->st_size) {
fprintf(stderr, "Haven't placed %s in static TLS yet but don't know its size?\n", symname);
}
current_tls_offset += sym->st_size; /* TODO alignment restrictions */
x += current_tls_offset;
hashmap_set(tls_map, symname, (void*)(current_tls_offset));
x -= current_tls_offset;
current_tls_offset += sym->st_size; /* TODO alignment restrictions */
} else {
x -= (size_t)hashmap_get(tls_map, symname);
x += (size_t)hashmap_get(tls_map, symname);
}
memcpy((void *)(table->r_offset + object->base), &x, sizeof(uintptr_t));
break;
@ -548,15 +548,9 @@ static int object_relocate(elf_t * object) {
if (!sym->st_size) {
fprintf(stderr, "Haven't placed %s in static TLS yet but don't know its size?\n", symname);
}
#if 0
current_tls_offset += sym->st_size; /* TODO alignment restrictions */
hashmap_set(tls_map, symname, (void*)(current_tls_offset));
x -= current_tls_offset;
#else
x += current_tls_offset;
hashmap_set(tls_map, symname, (void*)(current_tls_offset));
current_tls_offset += sym->st_size; /* TODO alignment restrictions */
#endif
} else {
size_t val = (size_t)hashmap_get(tls_map, symname);
TRACE_LD("add %#zx to %zx\n", val, x);