diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-01-03 14:37:49 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-01-03 14:44:33 +0100 |
| commit | 8100a075b7dd7471562decb1860571a335d68b0d (patch) | |
| tree | 331eebca0cbafd27aa691da4bc5fa281abb61d3d /libpthread/linuxthreads/pthread.c | |
| parent | e018b8ba1a0110120429de34366459af0771abe2 (diff) | |
| parent | 4ac7ad3543dd6d7780e71af80fa5c45414451719 (diff) | |
Merge commit 'origin/master' into prelink
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/linuxthreads/pthread.c')
| -rw-r--r-- | libpthread/linuxthreads/pthread.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libpthread/linuxthreads/pthread.c b/libpthread/linuxthreads/pthread.c index 614cad1f4..db436342f 100644 --- a/libpthread/linuxthreads/pthread.c +++ b/libpthread/linuxthreads/pthread.c @@ -49,7 +49,7 @@ extern int _h_errno; /* We need the global/static resolver state here. */ # include <resolv.h> # undef _res -extern struct __res_state _res; +extern struct __res_state *__resp; # endif #endif @@ -73,9 +73,6 @@ struct _pthread_descr_struct __pthread_initial_thread = { #if !(USE_TLS && HAVE___THREAD) .p_errnop = &_errno, .p_h_errnop = &_h_errno, -# if defined __UCLIBC_HAS_IPv4__ || defined __UCLIBC_HAS_IPV6__ - .p_resp = &_res, -# endif #endif .p_userstack = 1, .p_resume_count = __ATOMIC_INITIALIZER, @@ -544,14 +541,14 @@ static void pthread_initialize(void) THREAD_SETMEM (((pthread_descr) NULL), p_pid, __getpid()); # if !defined HAVE___THREAD && (defined __UCLIBC_HAS_IPv4__ || defined __UCLIBC_HAS_IPV6__) /* Likewise for the resolver state _res. */ - THREAD_SETMEM (((pthread_descr) NULL), p_resp, &_res); + THREAD_SETMEM (((pthread_descr) NULL), p_resp, __resp); # endif #else /* Update the descriptor for the initial thread. */ __pthread_initial_thread.p_pid = __getpid(); # if defined __UCLIBC_HAS_IPv4__ || defined __UCLIBC_HAS_IPV6__ /* Likewise for the resolver state _res. */ - __pthread_initial_thread.p_resp = &_res; + __pthread_initial_thread.p_resp = __resp; # endif #endif #if !__ASSUME_REALTIME_SIGNALS @@ -1129,7 +1126,7 @@ void __pthread_reset_main_thread(void) THREAD_SETMEM(self, p_errnop, &_errno); THREAD_SETMEM(self, p_h_errnop, &_h_errno); # if defined __UCLIBC_HAS_IPv4__ || defined __UCLIBC_HAS_IPV6__ - THREAD_SETMEM(self, p_resp, &_res); + THREAD_SETMEM(self, p_resp, __resp); # endif #endif |