diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2021-07-16 02:26:25 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-07-30 00:32:58 +0000 |
| commit | 61acafc6c67e1930803f70002d3a610f4314042a (patch) | |
| tree | db2eff69191d8c743e0387ea65ca35019839adfa | |
| parent | 9ac0aec3a32c84599cfbcc9f70ca2e035a3ddc0b (diff) | |
| download | src-61acafc6c67e1930803f70002d3a610f4314042a.tar.gz src-61acafc6c67e1930803f70002d3a610f4314042a.zip | |
rtld/arm64: Remove checks for undefined symbols when processing TPREL64
lld emits several GOT relocations referencing the null sumbol in libc.so
when compiled with -ftls-model=initial-exec. This symbol is specified
to be undefined.
We generally do not handle dynamic TLS relocations against weak,
undefined symbols, so avoid printing a warning here. This makes it
possible to compile libc.so using the initial-exec TLS model on arm64.
Reviewed by: jrtc27, kib
Sponsored by: The FreeBSD Foundation
(cherry picked from commit f238ebd1429312ac2a4cb9f764babc4b6f69721e)
| -rw-r--r-- | libexec/rtld-elf/aarch64/reloc.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c index 8d9c23a41aa5..8cc66c87d698 100644 --- a/libexec/rtld-elf/aarch64/reloc.c +++ b/libexec/rtld-elf/aarch64/reloc.c @@ -479,25 +479,8 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, int flags, return (-1); } } - /* Test weak undefined thread variable */ - if (def->st_shndx != SHN_UNDEF) { - *where = def->st_value + rela->r_addend + - defobj->tlsoffset; - } else { - /* - * XXX We should relocate undefined thread - * weak variable address to NULL, but how? - * Can we return error in this situation? - */ - rtld_printf("%s: Unable to relocate undefined " - "weak TLS variable\n", obj->path); -#if 0 - return (-1); -#else - *where = def->st_value + rela->r_addend + - defobj->tlsoffset; -#endif - } + *where = def->st_value + rela->r_addend + + defobj->tlsoffset; break; /* |