Date: Fri, 30 Jul 2021 00:33:19 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 61acafc6c67e - stable/13 - rtld/arm64: Remove checks for undefined symbols when processing TPREL64 Message-ID: <202107300033.16U0XJ5F043723@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=61acafc6c67e1930803f70002d3a610f4314042a commit 61acafc6c67e1930803f70002d3a610f4314042a Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2021-07-16 02:26:25 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2021-07-30 00:32:58 +0000 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) --- libexec/rtld-elf/aarch64/reloc.c | 21 ++------------------- 1 file 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; /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107300033.16U0XJ5F043723>