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

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index e26476ce..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,15 +13,14 @@ 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 = 
-		syscall(SYS_set_tid_address, &main_thread.tid);
+		__syscall(SYS_set_tid_address, &main_thread.tid);
 	return 0;
 }