The branch stable/13 has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4959d4f3eaab7e592657032a0b42b34c5d5c174b
commit 4959d4f3eaab7e592657032a0b42b34c5d5c174b
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-04-05 03:29:47 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-04-23 11:14:07 +0000
libc: implement __tls_get_addr() for static binaries
(cherry picked from commit ca46b5698e8ac38ab45d781d592700be59e7de97)
---
lib/libc/gen/tls.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c
index 2a64b5266f4a..69b87aea52bf 100644
--- a/lib/libc/gen/tls.c
+++ b/lib/libc/gen/tls.c
@@ -103,25 +103,32 @@ static size_t libc_tls_init_align;
static void *libc_tls_init;
#endif
+void *
+__libc_tls_get_addr(void *vti)
+{
+ Elf_Addr **dtvp, *dtv;
+ tls_index *ti;
+
+ dtvp = _get_tp();
+ dtv = *dtvp;
+ ti = vti;
+ return ((char *)(dtv[ti->ti_module + 1] + ti->ti_offset) +
+ TLS_DTV_OFFSET);
+}
+
#ifdef __i386__
/* GNU ABI */
__attribute__((__regparm__(1)))
void *
-___libc_tls_get_addr(void *ti __unused)
+___libc_tls_get_addr(void *vti)
{
- return (0);
+ return (__libc_tls_get_addr(vti));
}
#endif
-void *
-__libc_tls_get_addr(void *ti __unused)
-{
- return (0);
-}
-
#ifndef PIC
static void *
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
