Use glibc_likely instead __builtin_expect.

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

diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c
index b1e2b009a5e29d2d6a06eafe883ca3f7a2b86bc1..1876d9dfe7ac6ec84c9f116e5acd043b879dffb6 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-2014 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
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <dlfcn.h>
 #include <link.h>
@@ -32,9 +31,7 @@ dlinfo (void *handle, int request, void *arg)
 
 #else
 
-# ifdef USE_TLS
-#  include <dl-tls.h>
-# endif
+# include <dl-tls.h>
 
 struct dlinfo_args
 {
@@ -58,9 +55,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)
@@ -97,18 +93,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
+         data = GLRO(dl_tls_get_addr_soft) (l);
        *(void **) args->arg = data;
        break;
       }
@@ -119,7 +111,7 @@ int
 __dlinfo (void *handle, int request, void *arg DL_CALLER_DECL)
 {
 # ifdef SHARED
-  if (__builtin_expect (_dlfcn_hook != NULL, 0))
+  if (__glibc_unlikely (_dlfcn_hook != NULL))
     return _dlfcn_hook->dlinfo (handle, request, arg,
                                DL_CALLER);
 # endif