From 3459f702fdf460cab14d70e460bd45d7d83e7aa1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 10 Aug 2000 19:48:27 +0000 Subject: Update. 2000-08-10 Ulrich Drepper * timezone/zic.c: Update from tzcode2000f. * timezone/australasia: Update from tzdata2000f. * timezone/europe: Likewise. * timezone/southamerica: Likewise. * timezone/yearistype: Likewise. --- linuxthreads/pthread.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'linuxthreads/pthread.c') diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index 514ba5b71f..646a0049b7 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -41,6 +41,10 @@ extern struct __res_state _res; # error "This must not happen; new kernel assumed but old headers" #endif +/* These variables are used by the setup code. */ +extern int _errno; +extern int _h_errno; + /* Descriptor of the initial thread */ struct _pthread_descr_struct __pthread_initial_thread = { @@ -70,9 +74,9 @@ struct _pthread_descr_struct __pthread_initial_thread = { 0, /* char p_cancelstate */ 0, /* char p_canceltype */ 0, /* char p_canceled */ - NULL, /* int *p_errnop */ + &_errno, /* int *p_errnop */ 0, /* int p_errno */ - NULL, /* int *p_h_errnop */ + &_h_errno, /* int *p_h_errnop */ 0, /* int p_h_errno */ NULL, /* char * p_in_sighandler */ 0, /* char p_sigwaiting */ @@ -209,10 +213,6 @@ const int __pthread_offsetof_pid = offsetof(struct _pthread_descr_struct, const int __linuxthread_pthread_sizeof_descr = sizeof(struct _pthread_descr_struct); -/* These variables are used by the setup code. */ -extern int _errno; -extern int _h_errno; - /* Forward declarations */ static void pthread_exit_process(int retcode, void *arg); @@ -376,9 +376,6 @@ extern void *__dso_handle __attribute__ ((weak)); void __pthread_initialize_minimal(void) { - /* The errno/h_errno variable of the main thread are the global ones. */ - __pthread_initial_thread.p_errnop = &_errno; - __pthread_initial_thread.p_h_errnop = &_h_errno; /* If we have special thread_self processing, initialize that for the main thread now. */ #ifdef INIT_THREAD_SELF -- cgit v1.2.3