X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_self.c;h=c3d1be78be66b62101dfcfba8a0cc8dc101800ca;hp=3a4d4c581267e9f669ede16476cb69244ca21cae;hb=aa398f56fa398f2202b04e82c67f822f3233786f;hpb=7b2dd2235dd0db3a2f71e25d1c0925e0348e1996

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 3a4d4c58..c3d1be78 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -2,6 +2,10 @@
 
 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()
 {
@@ -10,13 +14,20 @@ 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);
 	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;
 }