X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_self.c;h=bd3bf95bb708ad6ce1f324e5e4eea05d978d172d;hb=21a172dd36cae7a08492fd3a7500d7bf0daee13e;hp=cc2ddfb72ff4cdb8e4bd5046c7326204f8dacd0e;hpb=28af39fe427ffec8b836f4f30450ffc30b03e5c4;p=musl

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index cc2ddfb7..bd3bf95b 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -1,34 +1,10 @@
 #include "pthread_impl.h"
+#include <threads.h>
 
-static struct pthread main_thread;
-
-/* pthread_key_create.c overrides this */
-static const void *dummy[1] = { 0 };
-weak_alias(dummy, __pthread_tsd_main);
-
-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.errno_ptr = __errno_location();
-	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()
+static pthread_t __pthread_self_internal()
 {
-	static int init, failed;
-	if (!init) {
-		if (failed) return 0;
-		if (init_main_thread() < 0) failed = 1;
-		if (failed) return 0;
-		init = 1;
-	}
 	return __pthread_self();
 }
 
-weak_alias(pthread_self, __pthread_self_init);
+weak_alias(__pthread_self_internal, pthread_self);
+weak_alias(__pthread_self_internal, thrd_current);