X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_self.c;h=f68896f78dacd8b1e753e2145434cc1d3db5e566;hb=07e62953c768f9f09485388c22ffaed98d11d676;hp=9f885d94a5472ce8a9b8644cf217e74f902c2881;hpb=dba68bf98fc708cea4c478278c889fc7ad802b00;p=musl diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c index 9f885d94..f68896f7 100644 --- a/src/thread/pthread_self.c +++ b/src/thread/pthread_self.c @@ -6,25 +6,21 @@ static struct pthread main_thread; static const void *dummy[1] = { 0 }; weak_alias(dummy, __pthread_tsd_main); -static int *errno_location() -{ - return __pthread_self()->errno_ptr; -} - static int init_main_thread() { + __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8); if (__set_thread_area(&main_thread) < 0) return -1; main_thread.canceldisable = libc.canceldisable; main_thread.tsd = (void **)__pthread_tsd_main; - 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 = + 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) { @@ -36,4 +32,5 @@ pthread_t pthread_self() return __pthread_self(); } -weak_alias(pthread_self, __pthread_self_init); +weak_alias(__pthread_self_def, pthread_self); +weak_alias(__pthread_self_def, __pthread_self_init);