diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
| commit | 8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5 (patch) | |
| tree | 196eec145dc3a6fb925a5b07d831b21d761d7c20 /dlfcn | |
| parent | 48b752c9f6499f0de89766c94b3b1bedbfd6476e (diff) | |
Updated to fedora-glibc-20061029T2155cvs/fedora-glibc-2_5_90-3
Diffstat (limited to 'dlfcn')
| -rw-r--r-- | dlfcn/Makefile | 5 | ||||
| -rw-r--r-- | dlfcn/dlinfo.c | 8 |
2 files changed, 2 insertions, 11 deletions
diff --git a/dlfcn/Makefile b/dlfcn/Makefile index 63e7b31b2a..e8fbab2958 100644 --- a/dlfcn/Makefile +++ b/dlfcn/Makefile @@ -41,10 +41,7 @@ endif ifeq (yes,$(build-shared)) tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit \ bug-dlopen1 bug-dlsym1 tst-dlinfo bug-atexit1 bug-atexit2 \ - bug-atexit3 -ifeq (yes,$(have-protected)) -tests += tstatexit -endif + bug-atexit3 tstatexit endif modules-names = glreflib1 glreflib2 failtestmod defaultmod1 defaultmod2 \ errmsg1mod modatexit modcxaatexit \ diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c index b1e2b009a5..923127cbf3 100644 --- a/dlfcn/dlinfo.c +++ b/dlfcn/dlinfo.c @@ -32,9 +32,7 @@ dlinfo (void *handle, int request, void *arg) #else -# ifdef USE_TLS -# include <dl-tls.h> -# endif +# include <dl-tls.h> struct dlinfo_args { @@ -97,18 +95,14 @@ RTLD_SELF used in code not dynamically loaded")); case RTLD_DI_TLS_MODID: *(size_t *) args->arg = 0; -#ifdef USE_TLS *(size_t *) args->arg = l->l_tls_modid; -#endif break; case RTLD_DI_TLS_DATA: { void *data = NULL; -#ifdef USE_TLS if (l->l_tls_modid != 0) data = _dl_tls_get_addr_soft (l); -#endif *(void **) args->arg = data; break; } |