aboutsummaryrefslogtreecommitdiff
path: root/resolv
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-02 03:32:24 +0000
committerRoland McGrath <roland@gnu.org>2002-08-02 03:32:24 +0000
commitc2afe833521105e05298500ba5d4676d6c833242 (patch)
tree226bb6da849fe8d860b766d3c365c8cfeb99b19e /resolv
parentae8f7f19faf701667d5e88195e3efc479c4a0746 (diff)
downloadglibc-c2afe833521105e05298500ba5d4676d6c833242.tar
glibc-c2afe833521105e05298500ba5d4676d6c833242.tar.gz
glibc-c2afe833521105e05298500ba5d4676d6c833242.tar.bz2
glibc-c2afe833521105e05298500ba5d4676d6c833242.zip
* sysdeps/pthread/bits/libc-tsd.h: Include <tls.h>.
[USE_TLS && HAVE___THREAD]: Just include the sysdeps/generic file, which does the right thing when __thread support is available. * descr.h (struct _pthread_descr_struct) [USE_TLS && HAVE___THREAD]: Omit `p_libc_specific', `p_errnop', `p_errno', `p_h_errnop', `p_h_errno', `p_resp', and `p_res' members. * pthread.c (__pthread_initialize_minimal) [USE_TLS && HAVE___THREAD]: Don't initialize `p_errnop' and `p_h_errnop' members. (__pthread_reset_main_thread): Likewise. (__pthread_initialize_manager): Likewise. * manager.c (__pthread_manager, pthread_handle_create): Likewise. * pthread.c (pthread_initialize) [USE_TLS && HAVE___THREAD]: Don't initialize `p_resp' member. (__pthread_reset_main_thread): Likewise. * manager.c (pthread_handle_create): Likewise. * specific.c (libc_internal_tsd_set, libc_internal_tsd_get): Conditionalize these on [!(USE_TLS && HAVE___THREAD)]. * errno.c [USE_TLS && HAVE___THREAD] (__h_errno_location, __res_state): Don't define these at all. * sysdeps/i386/tls.h (INSTALL_DTV): Add parens around arguments! (INSTALL_NEW_DTV, GET_DTV): Likewise. * sysdeps/sh/tls.h (INSTALL_DTV, INSTALL_NEW_DTV, GET_DTV): Likewise. * weaks.c: Don't include <errno.h> here. 2002-08-01 Roland McGrath <roland@redhat.com> * sysdeps/i386/tls.h (TLS_DO_MODIFY_LDT): New macro, broken out of TLS_INIT_TP. (TLS_DO_SET_THREAD_AREA): New macro, uses thread_set_area syscall. (TLS_SETUP_GS_SEGMENT): New macro, try one or the other or both. (TLS_INIT_TP): Use that.
Diffstat (limited to 'resolv')
-rw-r--r--resolv/netdb.h19
-rw-r--r--resolv/res_data.c6
-rw-r--r--resolv/res_libc.c7
-rw-r--r--resolv/resolv.h6
4 files changed, 11 insertions, 27 deletions
diff --git a/resolv/netdb.h b/resolv/netdb.h
index c3e07728c6..d041163ac6 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996,97,98,99,2000,01,02 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -59,23 +59,8 @@ extern int h_errno;
/* Function to get address of global `h_errno' variable. */
extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
-#ifdef _LIBC
-# ifdef _LIBC_REENTRANT
-static inline int
-__set_h_errno (int __err)
-{
- return *__h_errno_location () = __err;
-}
-# else
-# define __set_h_errno(x) (h_errno = (x))
-# endif /* _LIBC_REENTRANT */
-#endif /* _LIBC */
-
-
-#if !defined _LIBC || defined _LIBC_REENTRANT
/* Use a macro to access always the thread specific `h_errno' variable. */
-# define h_errno (*__h_errno_location ())
-#endif
+#define h_errno (*__h_errno_location ())
/* Possible values left in `h_errno'. */
diff --git a/resolv/res_data.c b/resolv/res_data.c
index 6aa697aecd..7488ba7772 100644
--- a/resolv/res_data.c
+++ b/resolv/res_data.c
@@ -39,8 +39,6 @@ static const char rcsid[] = "$BINDId: res_data.c,v 8.17 1999/10/13 17:11:31 vixi
#include <string.h>
#include <unistd.h>
-#undef _res
-
const char *_res_opcodes[] = {
"QUERY",
"IQUERY",
@@ -71,9 +69,9 @@ const char *_res_sectioncodes[] = {
#ifndef __BIND_NOSTATIC
#ifdef _LIBC
-extern struct __res_state _res;
-#else
/* The definition has been moved to res_libc.c. */
+#else
+#undef _res
struct __res_state _res
# if defined(__BIND_RES_TEXT)
= { RES_TIMEOUT, } /* Motorola, et al. */
diff --git a/resolv/res_libc.c b/resolv/res_libc.c
index c7561c9dc2..9f9af1d701 100644
--- a/resolv/res_libc.c
+++ b/resolv/res_libc.c
@@ -22,8 +22,15 @@
#undef _res
+#include <tls.h>
+
+#if USE_TLS && HAVE___THREAD
+/* With __thread support, this per-thread variable is used in all cases. */
+__thread struct __res_state _res;
+#else
/* The resolver state for use by single-threaded programs. */
struct __res_state _res;
+#endif
/* This function is used to access the resolver state in
single-threaded programs. */
diff --git a/resolv/resolv.h b/resolv/resolv.h
index 09bddb8965..0804d243db 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -224,16 +224,10 @@ struct res_sym {
/* 0x00008000 */
/* Things involving an internal (static) resolver context. */
-#if !defined _LIBC || defined _LIBC_REENTRANT
__BEGIN_DECLS
extern struct __res_state *__res_state(void) __attribute__ ((__const__));
__END_DECLS
#define _res (*__res_state())
-#else
-#ifndef __BIND_NOSTATIC
-extern struct __res_state _res;
-#endif
-#endif
#ifndef __BIND_NOSTATIC
#define fp_nquery __fp_nquery