Use glibc_likely instead __builtin_expect.

[jlayton/glibc.git] / dlfcn / dladdr.c

diff --git a/dlfcn/dladdr.c b/dlfcn/dladdr.c
index b5490e5a8dd68c8229d32cbfe738dc51d96fb61f..922ca44daea38466335d9798e0e0197507440d18 100644 (file)
--- a/dlfcn/dladdr.c
+++ b/dlfcn/dladdr.c
@@ -1,5 +1,5 @@
 /* Locate the shared object symbol nearest a given address.
-   Copyright (C) 1996, 1997, 1998, 1999, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1996-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,14 +13,31 @@
    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>
 
+#if !defined SHARED && defined IS_IN_libdl
+
 int
 dladdr (const void *address, Dl_info *info)
 {
+  return __dladdr (address, info);
+}
+
+#else
+
+int
+__dladdr (const void *address, Dl_info *info)
+{
+# ifdef SHARED
+  if (__glibc_unlikely (_dlfcn_hook != NULL))
+    return _dlfcn_hook->dladdr (address, info);
+# endif
   return _dl_addr (address, info, NULL, NULL);
 }
+# ifdef SHARED
+strong_alias (__dladdr, dladdr)
+# endif
+#endif