diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:39:27 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:39:27 +0000 |
| commit | 52629237a522c7c146d788ddaaf69946fd2729f9 (patch) | |
| tree | 552402b085cff37bc251fc0f45ed9255b53cdd57 /dlfcn/dladdr1.c | |
| parent | 3896c5809b49e72fbadc57da2189ff42aa2a5d02 (diff) | |
| parent | 064374be911f72dfaec8a75f06da1f9fc1827712 (diff) | |
Merge commit 'refs/top-bases/t/hurdsig-boot-fix' into t/hurdsig-boot-fix
Diffstat (limited to 'dlfcn/dladdr1.c')
| -rw-r--r-- | dlfcn/dladdr1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dlfcn/dladdr1.c b/dlfcn/dladdr1.c index 4c12506f8b..9b39d487ff 100644 --- a/dlfcn/dladdr1.c +++ b/dlfcn/dladdr1.c @@ -1,5 +1,5 @@ /* Locate the shared object symbol nearest a given address. - Copyright (C) 2003-2016 Free Software Foundation, Inc. + Copyright (C) 2003-2018 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 @@ -17,6 +17,7 @@ <http://www.gnu.org/licenses/>. */ #include <dlfcn.h> +#include <ldsodefs.h> #if !defined SHARED && IS_IN (libdl) @@ -32,7 +33,7 @@ int __dladdr1 (const void *address, Dl_info *info, void **extra, int flags) { # ifdef SHARED - if (__glibc_unlikely (_dlfcn_hook != NULL)) + if (!rtld_active ()) return _dlfcn_hook->dladdr1 (address, info, extra, flags); # endif |