git: 6295883670c3 - stable/13 - libc tls: use TLS_DTV_OFFSET defined by rtld.h

[Konstantin Belousov]

The branch stable/13 has been updated by kib:

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

commit 6295883670c37f005e59d2ea3b850389a5c6d308
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-08-15 02:14:26 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-08-23 09:20:56 +0000

    libc tls: use TLS_DTV_OFFSET defined by rtld.h
    
    (cherry picked from commit 300e08933e80e9fce02d0d2f7a64e3ad27e4ce8e)
---
 lib/libc/gen/tls.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c
index b5f5dfd4d315..d90aac028b88 100644
--- a/lib/libc/gen/tls.c
+++ b/lib/libc/gen/tls.c
@@ -81,12 +81,6 @@ void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign);
 #error TLS_TCB_ALIGN undefined for target architecture
 #endif
 
-#if defined(__mips__) || defined(__powerpc__) || defined(__riscv)
-#define DTV_OFFSET 0x8000
-#else
-#define DTV_OFFSET 0
-#endif
-
 #ifndef PIC
 
 static size_t libc_tls_static_space;
@@ -289,7 +283,7 @@ __libc_allocate_tls(void *oldtcb, size_t tcbsize, size_t tcbalign)
 
 		/* Adjust the DTV. */
 		dtv = tcb[0];
-		dtv[2] = (Elf_Addr)(tls + DTV_OFFSET);
+		dtv[2] = (Elf_Addr)(tls + TLS_DTV_OFFSET);
 	} else {
 		dtv = __je_bootstrap_malloc(3 * sizeof(Elf_Addr));
 		if (dtv == NULL) {
@@ -300,7 +294,7 @@ __libc_allocate_tls(void *oldtcb, size_t tcbsize, size_t tcbalign)
 		tcb[0] = dtv;
 		dtv[0] = 1;		/* Generation. */
 		dtv[1] = 1;		/* Segments count. */
-		dtv[2] = (Elf_Addr)(tls + DTV_OFFSET);
+		dtv[2] = (Elf_Addr)(tls + TLS_DTV_OFFSET);
 
 		if (libc_tls_init_size > 0)
 			memcpy(tls, libc_tls_init, libc_tls_init_size);