X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_create.c;h=f7768d8d03dd1dc9e8c5c26c974d9a86a8176571;hp=a6afd1e584873825dd4c3e2793b497fddddff236;hb=3f72cdac73030761120cf32aeef44e7d03e2f1fa;hpb=730bee725a770b543181424b52203dd1634ab5d1

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index a6afd1e5..f7768d8d 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -39,17 +39,28 @@ void __pthread_do_unwind(struct __ptcb *cb)
 	__syscall(SYS_exit, 0);
 }
 
+void __pthread_do_register(struct __ptcb *cb)
+{
+	struct pthread *self = pthread_self();
+	cb->__next = self->cancelbuf;
+	self->cancelbuf = cb;
+}
+
+void __pthread_do_unregister(struct __ptcb *cb)
+{
+	struct pthread *self = __pthread_self();
+	self->cancelbuf = self->cancelbuf->__next;
+}
+
 static int start(void *p)
 {
-	struct pthread *self = p;
+	pthread_t self = p;
 	if (self->unblock_cancel)
 		__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
 	pthread_exit(self->start(self->start_arg));
 	return 0;
 }
 
-int __uniclone(void *, int (*)(), void *);
-
 #define ROUND(x) (((x)+PAGE_SIZE-1)&-PAGE_SIZE)
 
 /* pthread_key_create.c overrides this */
@@ -106,14 +117,12 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	new->tsd = (void *)tsd;
 	if (attr) new->detached = attr->_a_detach;
 	new->unblock_cancel = self->cancel;
-	memcpy(new->tlsdesc, self->tlsdesc, sizeof new->tlsdesc);
-	new->tlsdesc[1] = (uintptr_t)new;
-	stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15);
+	stack = (void *)new;
 
 	__synccall_lock();
 
 	a_inc(&libc.threads_minus_1);
-	ret = __uniclone(stack, start, new);
+	ret = __clone(start, stack, 0x7d8f00, new, &new->tid, new, &new->tid);
 
 	__synccall_unlock();
 
@@ -131,5 +140,5 @@ void pthread_exit(void *result)
 	struct pthread *self = pthread_self();
 	struct __ptcb cb = { .__next = self->cancelbuf };
 	self->result = result;
-	__pthread_unwind_next(&cb);
+	__pthread_do_unwind(&cb);
 }