fix minor bugs due to incorrect threaded-predicate semantics

[musl] / src / thread / pthread_self.c

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 3a4d4c5..55d20c9 100644 (file)
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -2,7 +2,10 @@
 
 static struct pthread main_thread;
 
-#undef errno
+/* pthread_key_create.c overrides this */
+static const void *dummy[1] = { 0 };
+weak_alias(dummy, __pthread_tsd_main);
+
 static int *errno_location()
 {
        return __pthread_self()->errno_ptr;
@@ -10,13 +13,14 @@ static int *errno_location()
 
 static int init_main_thread()
 {
-       main_thread.self = &main_thread;
-       if (__set_thread_area(&main_thread) < 0)
-               return -1;
-       syscall1(__NR_set_tid_address, (long)&main_thread.tid);
+       if (__set_thread_area(&main_thread) < 0) return -1;
+       main_thread.canceldisable = libc.canceldisable;
+       main_thread.tsd = (void **)__pthread_tsd_main;
+       main_thread.self = libc.main_thread = &main_thread;
        main_thread.errno_ptr = __errno_location();
        libc.errno_location = errno_location;
-       main_thread.tid = main_thread.pid = getpid();
+       main_thread.tid = main_thread.pid = 
+               __syscall(SYS_set_tid_address, &main_thread.tid);
        return 0;
 }