|
@@ -6,7 +6,6 @@ static struct pthread main_thread;
|
|
|
static const void *dummy[1] = { 0 };
|
|
|
weak_alias(dummy, __pthread_tsd_main);
|
|
|
|
|
|
-#undef errno
|
|
|
static int *errno_location()
|
|
|
{
|
|
|
return __pthread_self()->errno_ptr;
|
|
@@ -14,11 +13,10 @@ static int *errno_location()
|
|
|
|
|
|
static int init_main_thread()
|
|
|
{
|
|
|
+ if (__set_thread_area(&main_thread) < 0) return -1;
|
|
|
main_thread.canceldisable = libc.canceldisable;
|
|
|
main_thread.tsd = (void **)__pthread_tsd_main;
|
|
|
- main_thread.self = &main_thread;
|
|
|
- if (__set_thread_area(&main_thread) < 0)
|
|
|
- return -1;
|
|
|
+ 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 =
|