X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_self.c;h=a8cc80b50b1c30c2de4c484c6773857f3a940750;hb=a5d6199d091aad750b1fc325240a141a88ee770e;hp=686d73d598faa52b4c63507dd16221c79f6ba574;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 686d73d5..a8cc80b5 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -2,31 +2,26 @@
 
 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.tlsdesc[0] = -1;
-	main_thread.tlsdesc[1] = (long)&main_thread;
-	main_thread.tlsdesc[2] = SIZE_MAX/PAGE_SIZE;
-	main_thread.tlsdesc[3] = 0x51;
-	main_thread.self = &main_thread;
+	__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+		SIGPT_SET, 0, __SYSCALL_SSLEN);
+	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();
-	if (__set_thread_area(main_thread.tlsdesc) < 0)
-		return -1;
-	syscall1(__NR_set_tid_address, (long)&main_thread.tid);
-	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;
 }
 
-#undef pthread_self
-
-pthread_t pthread_self()
+pthread_t __pthread_self_def()
 {
 	static int init, failed;
 	if (!init) {
@@ -37,3 +32,6 @@ pthread_t pthread_self()
 	}
 	return __pthread_self();
 }
+
+weak_alias(__pthread_self_def, pthread_self);
+weak_alias(__pthread_self_def, __pthread_self_init);