From 348ed5157bb4b6ef0e38f18ab8fd8d9910544e6e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 30 Nov 1998 14:21:53 +0000 Subject: Update. 1998-11-30 Andreas Jaeger * nscd/nscd_getpw_r.c: Include nscd_proto.h for prototypes. * sysdeps/generic/errno-loc.c: Include for prototype, undefine errno to get variable. * sysdeps/unix/sysv/linux/i386/setfsuid.c: Include instead of for prototype. * sysdeps/unix/sysv/linux/i386/setfsgid.c: Likewise. 1998-11-30 Ulrich Drepper * misc/err.h: Correct comments and use protected attribute keywords. Reported by Joseph Myers . 1998-11-29 Roland McGrath * malloc/thread-m.h [_LIBC]: Include , and remove tsd stuff from pthreads/cthreads libc sections. Use __libc_tsd_define for MALLOC key. [_LIBC] (tsd_key_t, tsd_key_create): Define to a zero-size type and a no-op, respectively. [_LIBC] (tsd_setspecific, tsd_getspecific): Use __libc_tsd_get/set. * elf/dl-error.c: Include . Use __libc_tsd_define for DL_ERROR key. (tsd_setspecific, tsd_getspecific): Rewritten using __libc_tsd_get/set. * sysdeps/mach/hurd/bits/libc-tsd.h: New file. * sysdeps/generic/bits/libc-tsd.h: New file. * Makefile (distribute): Add bits/libc-tsd.h. 1998-10-12 Roland McGrath * elf/dl-error.c: Remove kludge to check for ld.so load address. There is no need if weak undefined symbols are not used in ld.so; see linuxthreads/ChangeLog for changes to files linuxthreads/sysdeps/pthread/bits/libc-lock.h and linuxthreads/sysdeps/pthread/bits/libc-tsd.h. 1998-11-30 Andreas Jaeger * sysdeps/i386/bits/string.h (__memset_cc): Fix typo (s->__s). * sysdeps/i386/i486/bits/string.h: Add prototypes for all new inline functions. * sysdeps/i386/bits/string.h: Likewise. 1998-11-30 Andreas Jaeger * sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Remove ipc_kludge. 1998-11-30 Andreas Schwab * db2/progs/db_load/db_load.c (main): Avoid -Wparentheses warning. --- elf/dl-error.c | 45 ++++++--------------------------------------- 1 file changed, 6 insertions(+), 39 deletions(-) (limited to 'elf/dl-error.c') diff --git a/elf/dl-error.c b/elf/dl-error.c index ae63447453..9ccc193a66 100644 --- a/elf/dl-error.c +++ b/elf/dl-error.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include /* This structure communicates state between _dl_catch_error and _dl_signal_error. */ @@ -36,44 +36,11 @@ struct catch calls can come from `_dl_map_object_deps', `_dlerror_run', or from any of the libc functionality which loads dynamic objects (NSS, iconv). Therefore we have to be prepared to save the state in thread-local - memory. `catch' will only be used for the non-threaded case. - - Please note the horrible kludge we have to use to check for the - thread functions to be defined. The problem is that while running - ld.so standalone (i.e., before the relocation with the available - libc symbols) we do not have a real handling of undefined weak symbols. - All symbols are relocated, regardless of the availability. They are - relocated relative to the load address of the dynamic linker. Adding - this start address to zero (the value in the GOT for undefined symbols) - leads to an address which is the load address of ld.so. Once we have - relocated with the libc values the value is NULL if the function is - not available. Our "solution" is to regard NULL and the ld.so load - address as indicators for unavailable weak symbols. */ -static struct catch *catch; - -#ifdef PIC -# define tsd_setspecific(data) \ - if (__libc_internal_tsd_set != (void *) _dl_rtld_map.l_addr \ - && __libc_internal_tsd_set != NULL) \ - __libc_internal_tsd_set (_LIBC_TSD_KEY_DL_ERROR, data); \ - else \ - catch = (data) -# define tsd_getspecific() \ - (__libc_internal_tsd_set != (void *) _dl_rtld_map.l_addr \ - && __libc_internal_tsd_set != NULL \ - ? (struct catch *) __libc_internal_tsd_get (_LIBC_TSD_KEY_DL_ERROR) \ - : catch) -#else -# define tsd_setspecific(data) \ - if (__libc_internal_tsd_set != NULL) \ - __libc_internal_tsd_set (_LIBC_TSD_KEY_DL_ERROR, data); \ - else \ - catch = (data) -# define tsd_getspecific() \ - (__libc_internal_tsd_set != NULL \ - ? (struct catch *) __libc_internal_tsd_get (_LIBC_TSD_KEY_DL_ERROR) \ - : catch) -#endif + memory. */ + +__libc_tsd_define (static, DL_ERROR) +#define tsd_getspecific() __libc_tsd_get (DL_ERROR) +#define tsd_setspecific(data) __libc_tsd_set (DL_ERROR, (data)) /* This points to a function which is called when an error is -- cgit v1.2.3