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

diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
index c71f49c1..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;