work around "signal loses thread pointer" issue with "approach 2"

[musl] / src / thread / pthread_self.c

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 686d73d..51f12bb 100644 (file)
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -2,31 +2,24 @@
 
 static struct pthread main_thread;
 
-#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;
+       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();
-       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();
+       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 +30,6 @@ pthread_t pthread_self()
        }
        return __pthread_self();
 }
+
+weak_alias(__pthread_self_def, pthread_self);
+weak_alias(__pthread_self_def, __pthread_self_init);