X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_create.c;h=c73c52114074c66d3c04bf44b3cd18a1d2d78341;hp=af6ccf0760769ea6709b447227c705e07506a71f;hb=19eb13b9a4cf2f787f60b6e2a6d26a6cd7d3ffd2;hpb=0b2006c8fea021b7fa1fd267bf270cb8c279f230

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index af6ccf07..c73c5211 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -10,9 +10,6 @@ void __pthread_unwind_next(struct __ptcb *cb)
 	self = pthread_self();
 	if (self->cancel) self->result = PTHREAD_CANCELLED;
 
-	if (!a_fetch_add(&libc.threads_minus_1, -1))
-		exit(0);
-
 	LOCK(&self->exitlock);
 
 	not_finished = self->tsd_used;
@@ -28,6 +25,11 @@ void __pthread_unwind_next(struct __ptcb *cb)
 		}
 	}
 
+	syscall4(__NR_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1}, 0, 8);
+
+	if (!a_fetch_add(&libc.threads_minus_1, -1))
+		exit(0);
+
 	if (self->detached && self->map_base)
 		__unmapself(self->map_base, self->map_size);
 
@@ -173,8 +175,8 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	if (!init && ++init) init_threads();
 
 	if (!attr) attr = &default_attr;
-	guard = ROUND(attr->__guardsize + DEFAULT_GUARD_SIZE);
-	size = guard + ROUND(attr->__stacksize + DEFAULT_STACK_SIZE);
+	guard = ROUND(attr->_a_guardsize + DEFAULT_GUARD_SIZE);
+	size = guard + ROUND(attr->_a_stacksize + DEFAULT_STACK_SIZE);
 	size += __pthread_tsd_size;
 	map = mmap(0, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0);
 	if (!map) return EAGAIN;
@@ -190,7 +192,7 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	new->start_arg = arg;
 	new->self = new;
 	new->tsd = (void *)tsd;
-	new->detached = attr->__detach;
+	new->detached = attr->_a_detach;
 	new->attr = *attr;
 	memcpy(new->tlsdesc, self->tlsdesc, sizeof new->tlsdesc);
 	new->tlsdesc[1] = (uintptr_t)new;