X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fenv%2F__init_tls.c;h=eb2a6e4ada4559f626801042bcbd1eca7490e8de;hb=330fd96213da324f9164081df9a5226790d7c4ec;hp=e70025d77a01b25176c2ffd0487cee103cf047a6;hpb=0a96a37f06fda78ce3674b425888b1fc090578aa;p=musl

diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
index e70025d7..eb2a6e4a 100644
--- a/src/env/__init_tls.c
+++ b/src/env/__init_tls.c
@@ -1,5 +1,7 @@
 #include <elf.h>
 #include <limits.h>
+#include <sys/mman.h>
+#include <string.h>
 #include "pthread_impl.h"
 #include "libc.h"
 #include "atomic.h"
@@ -15,11 +17,18 @@ void *__copy_tls(unsigned char *mem)
 	if (!image) return mem;
 	void **dtv = (void *)mem;
 	dtv[0] = (void *)1;
-	mem += __libc.tls_size - sizeof(struct pthread);
+#ifdef TLS_ABOVE_TP
+	mem += sizeof(void *) * 2;
+	mem += -((uintptr_t)mem + sizeof(struct pthread)) & (align-1);
+	td = (pthread_t)mem;
+	mem += sizeof(struct pthread);
+#else
+	mem += libc.tls_size - sizeof(struct pthread);
 	mem -= (uintptr_t)mem & (align-1);
 	td = (pthread_t)mem;
 	td->dtv = dtv;
 	mem -= size;
+#endif
 	dtv[1] = mem;
 	memcpy(mem, image, len);
 	return td;
@@ -33,7 +42,7 @@ void *__tls_get_addr(size_t *v)
 static void *simple(void *p)
 {
 	*(void **)p = p;
-	return __set_thread_area(p) ? 0 : p;
+	return __set_thread_area(TP_ADJ(p)) ? 0 : p;
 }
 
 weak_alias(simple, __install_initial_tls);
@@ -49,10 +58,12 @@ typedef Elf64_Phdr Phdr;
 void __init_tls(size_t *aux)
 {
 	unsigned char *p, *mem;
-	size_t n, d;
+	size_t n;
 	Phdr *phdr, *tls_phdr=0;
 	size_t base = 0;
 
+	libc.tls_size = sizeof(struct pthread);
+
 	for (p=(void *)aux[AT_PHDR],n=aux[AT_PHNUM]; n; n--,p+=aux[AT_PHENT]) {
 		phdr = (void *)p;
 		if (phdr->p_type == PT_PHDR)