X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_self.c;h=9f885d94a5472ce8a9b8644cf217e74f902c2881;hp=028d387b13c4a7f02e07e0f622611e32490dc87e;hb=dba68bf98fc708cea4c478278c889fc7ad802b00;hpb=b480808a6a511c9350a6559b63938ac261c83a76

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 028d387b..9f885d94 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -3,10 +3,9 @@
 static struct pthread main_thread;
 
 /* pthread_key_create.c overrides this */
-static const size_t dummy = 0;
-weak_alias(dummy, __pthread_tsd_size);
+static const void *dummy[1] = { 0 };
+weak_alias(dummy, __pthread_tsd_main);
 
-#undef errno
 static int *errno_location()
 {
 	return __pthread_self()->errno_ptr;
@@ -14,20 +13,14 @@ static int *errno_location()
 
 static int init_main_thread()
 {
-	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;
-	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;
 }
 
@@ -42,3 +35,5 @@ pthread_t pthread_self()
 	}
 	return __pthread_self();
 }
+
+weak_alias(pthread_self, __pthread_self_init);