TLS (GNU/C11 thread-local storage) support for static-linked programs

[musl] / src / thread / pthread_self.c

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index e26476c..a93d812 100644 (file)
--- 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};
 
 /* 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()
 {
-       main_thread.canceldisable = libc.canceldisable;
-       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);
+       __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();
+       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()
+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();
+}