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

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 686d73d5..23dbaa5e 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -1,32 +1,27 @@
 #include "pthread_impl.h"
 
-static struct pthread main_thread;
+static struct pthread *main_thread = &(struct pthread){0};
 
-#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;
-	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();
+	__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+		SIGPT_SET, 0, __SYSCALL_SSLEN);
+	if (__set_thread_area(TP_ADJ(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;
 }
 
-#undef pthread_self
-
-pthread_t pthread_self()
+pthread_t __pthread_self_def()
 {
 	static int init, failed;
 	if (!init) {
@@ -37,3 +32,12 @@ pthread_t pthread_self()
 	}
 	return __pthread_self();
 }
+
+weak_alias(__pthread_self_def, pthread_self);
+weak_alias(__pthread_self_def, __pthread_self_init);
+
+void *__install_initial_tls(void *p)
+{
+	main_thread = p;
+	return __pthread_self_def();
+}