The branch main has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=ca46b5698e8ac38ab45d781d592700be59e7de97

commit ca46b5698e8ac38ab45d781d592700be59e7de97
Author:     Konstantin Belousov <[email protected]>
AuthorDate: 2021-04-05 03:29:47 +0000
Commit:     Konstantin Belousov <[email protected]>
CommitDate: 2021-04-09 20:46:24 +0000

    libc: implement __tls_get_addr() for static binaries
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D29623
---
 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 *
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "[email protected]"

Reply via email to