diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:56:13 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:57:13 +0000 |
| commit | 82dd75a7f436a19047325d62182590c9f9e23a78 (patch) | |
| tree | 60ca20c8cf2b0d178d84725c0715471f76df97e1 /dlfcn/dlvsym.c | |
| parent | 0bbb676a2342367c4e52b35e890f24667dabb348 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/tls' into t/tls
Diffstat (limited to 'dlfcn/dlvsym.c')
| -rw-r--r-- | dlfcn/dlvsym.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dlfcn/dlvsym.c b/dlfcn/dlvsym.c index 8daec67dbb..7fac2e4461 100644 --- a/dlfcn/dlvsym.c +++ b/dlfcn/dlvsym.c @@ -1,5 +1,5 @@ /* Look up a versioned symbol in a shared object loaded by `dlopen'. - Copyright (C) 1995-2016 Free Software Foundation, Inc. + Copyright (C) 1995-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 @@ -58,7 +58,7 @@ __dlvsym (void *handle, const char *name, const char *version_str DL_CALLER_DECL) { # ifdef SHARED - if (__glibc_unlikely (_dlfcn_hook != NULL)) + if (!rtld_active ()) return _dlfcn_hook->dlvsym (handle, name, version_str, DL_CALLER); # endif |