X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_self.c;h=9f885d94a5472ce8a9b8644cf217e74f902c2881;hp=83efa9e874da9119c82d6c8e86c9848bf23f8e04;hb=dba68bf98fc708cea4c478278c889fc7ad802b00;hpb=6c16d3e98ab2e466bb12ded12dfad1f8f272b1f8

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 83efa9e8..9f885d94 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -6,7 +6,6 @@ static struct pthread main_thread;
 static const void *dummy[1] = { 0 };
 weak_alias(dummy, __pthread_tsd_main);
 
-#undef errno
 static int *errno_location()
 {
 	return __pthread_self()->errno_ptr;
@@ -14,14 +13,14 @@ static int *errno_location()
 
 static int init_main_thread()
 {
+	if (__set_thread_area(&main_thread) < 0) return -1;
+	main_thread.canceldisable = libc.canceldisable;
 	main_thread.tsd = (void **)__pthread_tsd_main;
-	main_thread.self = &main_thread;
-	if (__set_thread_area(&main_thread) < 0)
-		return -1;
+	main_thread.self = libc.main_thread = &main_thread;
 	main_thread.errno_ptr = __errno_location();
 	libc.errno_location = errno_location;
 	main_thread.tid = main_thread.pid = 
-		syscall(SYS_set_tid_address, &main_thread.tid);
+		__syscall(SYS_set_tid_address, &main_thread.tid);
 	return 0;
 }
 
@@ -36,3 +35,5 @@ pthread_t pthread_self()
 	}
 	return __pthread_self();
 }
+
+weak_alias(pthread_self, __pthread_self_init);