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

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 3a4d4c58..83efa9e8 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -2,6 +2,10 @@
 
 static struct pthread main_thread;
 
+/* pthread_key_create.c overrides this */
+static const void *dummy[1] = { 0 };
+weak_alias(dummy, __pthread_tsd_main);
+
 #undef errno
 static int *errno_location()
 {
@@ -10,13 +14,14 @@ static int *errno_location()
 
 static int init_main_thread()
 {
+	main_thread.tsd = (void **)__pthread_tsd_main;
 	main_thread.self = &main_thread;
 	if (__set_thread_area(&main_thread) < 0)
 		return -1;
-	syscall1(__NR_set_tid_address, (long)&main_thread.tid);
 	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;
 }