X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_self.c;h=55d20c9f8a9ac759a6747cac9e073a170db24c22;hb=4c4e22d781d75a461097cccc2ecac5adbafb1a59;hp=e8bb9181502afc87388d27b8ddbdc6658bad24d4;hpb=eb0e8fa0b1960cff4bd65ebefc798f70273b0bc9;p=musl

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index e8bb9181..55d20c9f 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -6,7 +6,6 @@ static struct pthread main_thread;
 static const void *dummy[1] = { 0 };
 weak_alias(dummy, __pthread_tsd_main);
 
-#undef errno
 static int *errno_location()
 {
 	return __pthread_self()->errno_ptr;
@@ -14,11 +13,10 @@ static int *errno_location()
 
 static int init_main_thread()
 {
+	if (__set_thread_area(&main_thread) < 0) return -1;
 	main_thread.canceldisable = libc.canceldisable;
 	main_thread.tsd = (void **)__pthread_tsd_main;
-	main_thread.self = &main_thread;
-	if (__set_thread_area(&main_thread) < 0)
-		return -1;
+	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 =