projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finish unifying thread register handling in preparation for porting
[musl]
/
src
/
thread
/
pthread_self.c
diff --git
a/src/thread/pthread_self.c
b/src/thread/pthread_self.c
index
686d73d
..
3a4d4c5
100644
(file)
--- a/
src/thread/pthread_self.c
+++ b/
src/thread/pthread_self.c
@@
-5,27
+5,21
@@
static struct pthread main_thread;
#undef errno
static int *errno_location()
{
#undef errno
static int *errno_location()
{
- return pthread_self()->errno_ptr;
+ return
__
pthread_self()->errno_ptr;
}
static int init_main_thread()
{
}
static int init_main_thread()
{
- main_thread.tlsdesc[0] = -1;
- main_thread.tlsdesc[1] = (long)&main_thread;
- main_thread.tlsdesc[2] = SIZE_MAX/PAGE_SIZE;
- main_thread.tlsdesc[3] = 0x51;
main_thread.self = &main_thread;
main_thread.self = &main_thread;
- main_thread.errno_ptr = __errno_location();
- if (__set_thread_area(main_thread.tlsdesc) < 0)
+ if (__set_thread_area(&main_thread) < 0)
return -1;
syscall1(__NR_set_tid_address, (long)&main_thread.tid);
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();
return 0;
}
libc.errno_location = errno_location;
main_thread.tid = main_thread.pid = getpid();
return 0;
}
-#undef pthread_self
-
pthread_t pthread_self()
{
static int init, failed;
pthread_t pthread_self()
{
static int init, failed;