From 7b2dd2235dd0db3a2f71e25d1c0925e0348e1996 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 15 Feb 2011 03:56:52 -0500 Subject: finish unifying thread register handling in preparation for porting --- src/thread/pthread_self.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/thread/pthread_self.c') diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c index 686d73d5..3a4d4c58 100644 --- 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() { - return pthread_self()->errno_ptr; + return __pthread_self()->errno_ptr; } 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.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); + main_thread.errno_ptr = __errno_location(); 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; -- cgit v1.2.1