X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_self.c;h=51f12bb3227951668c7e75273e9d868a58ca63f2;hb=af3330d7648627816fbc82aa3247419e8a528230;hp=d2de2cb8f0b207be46b091365b1cc11ad2249db1;hpb=6dc05fbe198ccb326dceb8f05ee943f9a4dfb4ba;p=musl

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index d2de2cb8..51f12bb3 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -3,35 +3,23 @@
 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;
-}
+static const void *dummy[1] = { 0 };
+weak_alias(dummy, __pthread_tsd_main);
 
 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;
+	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();
-	libc.errno_location = errno_location;
-	main_thread.tid = main_thread.pid = 
-		syscall1(__NR_set_tid_address, (long)&main_thread.tid);
+	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;
 }
 
-pthread_t pthread_self()
+pthread_t __pthread_self_def()
 {
 	static int init, failed;
 	if (!init) {
@@ -42,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);