X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_self.c;h=241a6202d2ea5e15ca53a5e8676398f6c5c95b8e;hb=4cd8b4725907651f329e2f96d428c4e3521643f8;hp=83efa9e874da9119c82d6c8e86c9848bf23f8e04;hpb=6c16d3e98ab2e466bb12ded12dfad1f8f272b1f8;p=musl

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 83efa9e8..241a6202 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -1,38 +1,11 @@
 #include "pthread_impl.h"
+#include <threads.h>
+#include "libc.h"
 
-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()
-{
-	return __pthread_self()->errno_ptr;
-}
-
-static int init_main_thread()
+static pthread_t __pthread_self_internal()
 {
-	main_thread.tsd = (void **)__pthread_tsd_main;
-	main_thread.self = &main_thread;
-	if (__set_thread_area(&main_thread) < 0)
-		return -1;
-	main_thread.errno_ptr = __errno_location();
-	libc.errno_location = errno_location;
-	main_thread.tid = main_thread.pid = 
-		syscall(SYS_set_tid_address, &main_thread.tid);
-	return 0;
-}
-
-pthread_t pthread_self()
-{
-	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_internal, pthread_self);
+weak_alias(__pthread_self_internal, thrd_current);