diff options
Diffstat (limited to 'dlfcn')
| -rw-r--r-- | dlfcn/Makefile | 5 | ||||
| -rw-r--r-- | dlfcn/dlinfo.c | 15 |
2 files changed, 14 insertions, 6 deletions
diff --git a/dlfcn/Makefile b/dlfcn/Makefile index e8fbab2958..63e7b31b2a 100644 --- a/dlfcn/Makefile +++ b/dlfcn/Makefile @@ -41,7 +41,10 @@ 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 tstatexit + bug-atexit3 +ifeq (yes,$(have-protected)) +tests += tstatexit +endif endif modules-names = glreflib1 glreflib2 failtestmod defaultmod1 defaultmod2 \ errmsg1mod modatexit modcxaatexit \ diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c index 923127cbf3..20aa9504fb 100644 --- a/dlfcn/dlinfo.c +++ b/dlfcn/dlinfo.c @@ -1,5 +1,5 @@ /* dlinfo -- Get information from the dynamic linker. - Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2006, 2007 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 @@ -32,7 +32,9 @@ dlinfo (void *handle, int request, void *arg) #else -# include <dl-tls.h> +# ifdef USE_TLS +# include <dl-tls.h> +# endif struct dlinfo_args { @@ -56,9 +58,8 @@ dlinfo_doit (void *argsblock) /* Find the highest-addressed object that CALLER is not below. */ for (nsid = 0; nsid < DL_NNS; ++nsid) for (l = GL(dl_ns)[nsid]._ns_loaded; l != NULL; l = l->l_next) - if (caller >= l->l_map_start && caller < l->l_map_end) - /* There must be exactly one DSO for the range of the virtual - memory. Otherwise something is really broken. */ + if (caller >= l->l_map_start && caller < l->l_map_end + && (l->l_contiguous || _dl_addr_inside_object (l, caller))) break; if (l == NULL) @@ -95,14 +96,18 @@ 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; } |