X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fenv%2F__init_tls.c;h=a4704f0678fa74af0f442ae7fababe9745979bb9;hp=ab5992ce1c928eaccddc44bd8f301f2a5b98a981;hb=f1292e3d28309bbc81f61671164843cec4319bfa;hpb=9ec4283b28cf676292fd5c6f681bef1e90e30c18

diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
index ab5992ce..a4704f06 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"
@@ -21,12 +23,12 @@ void *__copy_tls(unsigned char *mem)
 	td = (pthread_t)mem;
 	mem += sizeof(struct pthread);
 #else
-	mem += __libc.tls_size - sizeof(struct pthread);
+	mem += libc.tls_size - sizeof(struct pthread);
 	mem -= (uintptr_t)mem & (align-1);
 	td = (pthread_t)mem;
-	td->dtv = dtv;
 	mem -= size;
 #endif
+	td->dtv = dtv;
 	dtv[1] = mem;
 	memcpy(mem, image, len);
 	return td;
@@ -56,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)