aboutsummaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2021-07-16 02:26:25 +0000
committerMark Johnston <markj@FreeBSD.org>2021-07-16 02:41:10 +0000
commitf238ebd1429312ac2a4cb9f764babc4b6f69721e (patch)
tree7b5f244becf451697fc75b6c0f2d9e3cb724bafb /libexec
parentad1f608fb2f529baf028384bbe7e8fbbff5cbe23 (diff)
Diffstat (limited to 'libexec')
-rw-r--r--libexec/rtld-elf/aarch64/reloc.c21
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;
/*