.

[thirdparty/glibc.git] / dlfcn / dlinfo.c

diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c
index 923127cbf3d2c91827bc75b14ec817bab3dac563..20aa9504fb1bbfe8392c28b18936644cd25d16e2 100644 (file)
--- 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;
       }