move rsyscall out of pthread_create module

[musl] / src / thread / pthread_self.c

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 3a4d4c5..83efa9e 100644 (file)
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -2,6 +2,10 @@
 
 static struct pthread main_thread;
 
+/* pthread_key_create.c overrides this */
+static const void *dummy[1] = { 0 };
+weak_alias(dummy, __pthread_tsd_main);
+
 #undef errno
 static int *errno_location()
 {
@@ -10,13 +14,14 @@ static int *errno_location()
 
 static int init_main_thread()
 {
+       main_thread.tsd = (void **)__pthread_tsd_main;
        main_thread.self = &main_thread;
        if (__set_thread_area(&main_thread) < 0)
                return -1;
-       syscall1(__NR_set_tid_address, (long)&main_thread.tid);
        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;
 }