projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix stupid bug in updating of O_ACCMODE for O_SEARCH support
[musl]
/
src
/
thread
/
pthread_self.c
diff --git
a/src/thread/pthread_self.c
b/src/thread/pthread_self.c
index
83efa9e
..
a8cc80b
100644
(file)
--- a/
src/thread/pthread_self.c
+++ b/
src/thread/pthread_self.c
@@
-6,26
+6,22
@@
static struct pthread main_thread;
static const void *dummy[1] = { 0 };
weak_alias(dummy, __pthread_tsd_main);
static const void *dummy[1] = { 0 };
weak_alias(dummy, __pthread_tsd_main);
-#undef errno
-static int *errno_location()
-{
- return __pthread_self()->errno_ptr;
-}
-
static int init_main_thread()
{
static int init_main_thread()
{
+ __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+ SIGPT_SET, 0, __SYSCALL_SSLEN);
+ if (__set_thread_area(&main_thread) < 0) return -1;
+ main_thread.canceldisable = libc.canceldisable;
main_thread.tsd = (void **)__pthread_tsd_main;
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();
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);
+ 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;
}
return 0;
}
-pthread_t
pthread_sel
f()
+pthread_t
__pthread_self_de
f()
{
static int init, failed;
if (!init) {
{
static int init, failed;
if (!init) {
@@
-36,3
+32,6
@@
pthread_t pthread_self()
}
return __pthread_self();
}
}
return __pthread_self();
}
+
+weak_alias(__pthread_self_def, pthread_self);
+weak_alias(__pthread_self_def, __pthread_self_init);