X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_self.c;h=f68896f78dacd8b1e753e2145434cc1d3db5e566;hb=9372655e884b3829c6639fc1a6047b2569f3c3ec;hp=3a4d4c581267e9f669ede16476cb69244ca21cae;hpb=7b2dd2235dd0db3a2f71e25d1c0925e0348e1996;p=musl

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 3a4d4c58..f68896f7 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -2,25 +2,25 @@
 
 static struct pthread main_thread;
 
-#undef errno
-static int *errno_location()
-{
-	return __pthread_self()->errno_ptr;
-}
+/* pthread_key_create.c overrides this */
+static const void *dummy[1] = { 0 };
+weak_alias(dummy, __pthread_tsd_main);
 
 static int init_main_thread()
 {
-	main_thread.self = &main_thread;
-	if (__set_thread_area(&main_thread) < 0)
-		return -1;
-	syscall1(__NR_set_tid_address, (long)&main_thread.tid);
+	__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
+	if (__set_thread_area(&main_thread) < 0) return -1;
+	main_thread.canceldisable = libc.canceldisable;
+	main_thread.tsd = (void **)__pthread_tsd_main;
 	main_thread.errno_ptr = __errno_location();
-	libc.errno_location = errno_location;
-	main_thread.tid = main_thread.pid = getpid();
+	main_thread.self = &main_thread;
+	main_thread.tid = main_thread.pid =
+		__syscall(SYS_set_tid_address, &main_thread.tid);
+	libc.main_thread = &main_thread;
 	return 0;
 }
 
-pthread_t pthread_self()
+pthread_t __pthread_self_def()
 {
 	static int init, failed;
 	if (!init) {
@@ -31,3 +31,6 @@ pthread_t pthread_self()
 	}
 	return __pthread_self();
 }
+
+weak_alias(__pthread_self_def, pthread_self);
+weak_alias(__pthread_self_def, __pthread_self_init);