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

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 3a4d4c58..55d20c9f 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -2,7 +2,10 @@
 
 static struct pthread main_thread;
 
-#undef errno
+/* pthread_key_create.c overrides this */
+static const void *dummy[1] = { 0 };
+weak_alias(dummy, __pthread_tsd_main);
+
 static int *errno_location()
 {
 	return __pthread_self()->errno_ptr;
@@ -10,13 +13,14 @@ static int *errno_location()
 
 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);
+	if (__set_thread_area(&main_thread) < 0) return -1;
+	main_thread.canceldisable = libc.canceldisable;
+	main_thread.tsd = (void **)__pthread_tsd_main;
+	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 = getpid();
+	main_thread.tid = main_thread.pid = 
+		__syscall(SYS_set_tid_address, &main_thread.tid);
 	return 0;
 }