projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix return types for aio_read and aio_write again
[musl]
/
src
/
thread
/
pthread_self.c
diff --git
a/src/thread/pthread_self.c
b/src/thread/pthread_self.c
index
3a4d4c5
..
cc2ddfb
100644
(file)
--- a/
src/thread/pthread_self.c
+++ b/
src/thread/pthread_self.c
@@
-2,21
+2,20
@@
static struct pthread main_thread;
static struct pthread main_thread;
-#undef errno
-static int *errno_location()
-{
- return __pthread_self()->errno_ptr;
-}
+/* pthread_key_create.c overrides this */
+static const void *dummy[1] = { 0 };
+weak_alias(dummy, __pthread_tsd_main);
static int init_main_thread()
{
static int init_main_thread()
{
- main_thread.self = &main_thread;
- if (__set_thread_area(&main_thread) < 0)
- return -1;
- syscall1(__NR_set_tid_address, (long)&main_thread.tid);
+ if (__set_thread_area(&main_thread) < 0) return -1;
+ main_thread.canceldisable = libc.canceldisable;
+ main_thread.tsd = (void **)__pthread_tsd_main;
main_thread.errno_ptr = __errno_location();
main_thread.errno_ptr = __errno_location();
- libc.errno_location = errno_location;
- main_thread.tid = main_thread.pid = getpid();
+ 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;
}
@@
-31,3
+30,5
@@
pthread_t pthread_self()
}
return __pthread_self();
}
}
return __pthread_self();
}
+
+weak_alias(pthread_self, __pthread_self_init);