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

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index d2de2cb8..83efa9e8 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -3,8 +3,8 @@
 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()
@@ -14,20 +14,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.tsd = (void **)__pthread_tsd_main;
 	main_thread.self = &main_thread;
 	if (__set_thread_area(&main_thread) < 0)
 		return -1;
 	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);
+		syscall(SYS_set_tid_address, &main_thread.tid);
 	return 0;
 }