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

diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
index ab5992ce..5c176811 100644
--- a/src/env/__init_tls.c
+++ b/src/env/__init_tls.c
@@ -1,34 +1,40 @@
 #include <elf.h>
 #include <limits.h>
+#include <sys/mman.h>
+#include <string.h>
 #include "pthread_impl.h"
 #include "libc.h"
 #include "atomic.h"
 
 #ifndef SHARED
 
-static void *image;
-static size_t len, size, align;
+struct tls_image {
+	void *image;
+	size_t len, size, align;
+} __static_tls ATTR_LIBC_VISIBILITY;
+
+#define T __static_tls
 
 void *__copy_tls(unsigned char *mem)
 {
 	pthread_t td;
-	if (!image) return mem;
+	if (!T.image) return mem;
 	void **dtv = (void *)mem;
 	dtv[0] = (void *)1;
 #ifdef TLS_ABOVE_TP
 	mem += sizeof(void *) * 2;
-	mem += -((uintptr_t)mem + sizeof(struct pthread)) & (align-1);
+	mem += -((uintptr_t)mem + sizeof(struct pthread)) & (T.align-1);
 	td = (pthread_t)mem;
 	mem += sizeof(struct pthread);
 #else
-	mem += __libc.tls_size - sizeof(struct pthread);
-	mem -= (uintptr_t)mem & (align-1);
+	mem += libc.tls_size - sizeof(struct pthread);
+	mem -= (uintptr_t)mem & (T.align-1);
 	td = (pthread_t)mem;
-	td->dtv = dtv;
-	mem -= size;
+	mem -= T.size;
 #endif
+	td->dtv = dtv;
 	dtv[1] = mem;
-	memcpy(mem, image, len);
+	memcpy(mem, T.image, T.len);
 	return td;
 }
 
@@ -56,10 +62,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)
@@ -69,15 +77,15 @@ void __init_tls(size_t *aux)
 	}
 	if (!tls_phdr) return;
 
-	image = (void *)(base + tls_phdr->p_vaddr);
-	len = tls_phdr->p_filesz;
-	size = tls_phdr->p_memsz;
-	align = tls_phdr->p_align;
+	T.image = (void *)(base + tls_phdr->p_vaddr);
+	T.len = tls_phdr->p_filesz;
+	T.size = tls_phdr->p_memsz;
+	T.align = tls_phdr->p_align;
 
-	size += (-size - (uintptr_t)image) & (align-1);
-	if (align < 4*sizeof(size_t)) align = 4*sizeof(size_t);
+	T.size += (-T.size - (uintptr_t)T.image) & (T.align-1);
+	if (T.align < 4*sizeof(size_t)) T.align = 4*sizeof(size_t);
 
-	libc.tls_size = 2*sizeof(void *)+size+align+sizeof(struct pthread);
+	libc.tls_size = 2*sizeof(void *)+T.size+T.align+sizeof(struct pthread);
 
 	mem = __mmap(0, libc.tls_size, PROT_READ|PROT_WRITE,
 		MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);