X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_self.c;h=aed4b5f1ba1a759394c2913d025df4048c2e2908;hp=d2493fcf3f4d5371f6a1a48fcc1bd014c47016a1;hb=b6218764ebca59ff5dae0e87b696188c8de0119e;hpb=357876052b125dcd74882f61afec19d8f519074c

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index d2493fcf..aed4b5f1 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -1,6 +1,6 @@
 #include "pthread_impl.h"
 
-static struct pthread main_thread;
+static struct pthread *main_thread = &(struct pthread){0};
 
 /* pthread_key_create.c overrides this */
 static const void *dummy[1] = { 0 };
@@ -8,18 +8,22 @@ 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;
+	__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+		SIGPT_SET, 0, _NSIG/8);
+	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);
+	if (!main_thread->dtv)
+		main_thread->dtv = (void *)dummy;
+	libc.main_thread = main_thread;
 	return 0;
 }
 
-pthread_t pthread_self()
+pthread_t __pthread_self_def()
 {
 	static int init, failed;
 	if (!init) {
@@ -31,4 +35,11 @@ pthread_t pthread_self()
 	return __pthread_self();
 }
 
-weak_alias(pthread_self, __pthread_self_init);
+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();
+}