global cleanup to use the new syscall interface

[musl] / src / thread / pthread_self.c

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 686d73d..c3d1be7 100644 (file)
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -2,30 +2,35 @@
 
 static struct pthread main_thread;
 
+/* pthread_key_create.c overrides this */
+static const size_t dummy = 0;
+weak_alias(dummy, __pthread_tsd_size);
+
 #undef errno
 static int *errno_location()
 {
-       return pthread_self()->errno_ptr;
+       return __pthread_self()->errno_ptr;
 }
 
 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;
+       void *tsd = 0;
+       if (__pthread_tsd_size) {
+               tsd = mmap(0, __pthread_tsd_size, PROT_READ|PROT_WRITE,
+                       MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+               if (tsd == MAP_FAILED) return -1;
+       }
+       main_thread.tsd = tsd;
        main_thread.self = &main_thread;
-       main_thread.errno_ptr = __errno_location();
-       if (__set_thread_area(main_thread.tlsdesc) < 0)
+       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;
 }
 
-#undef pthread_self
-
 pthread_t pthread_self()
 {
        static int init, failed;