diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
| commit | 8d59503b977070aaa4e504e8d6dcb7da3711893e (patch) | |
| tree | 8272c9c2cce43afa4fe4d8d92c269a6435242661 /dlfcn/dlopenold.c | |
| parent | 76a7dc16fab8853ef9230447fa98c70a3619dc6d (diff) | |
| parent | bcea9593527d90b9f9ff3817e3fbf0fbc3d01fa7 (diff) | |
Merge commit 'refs/top-bases/t/gsync-libc-merge' into t/gsync-libc-merge
Diffstat (limited to 'dlfcn/dlopenold.c')
| -rw-r--r-- | dlfcn/dlopenold.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dlfcn/dlopenold.c b/dlfcn/dlopenold.c index 79d46ff603..d3b6a6cff5 100644 --- a/dlfcn/dlopenold.c +++ b/dlfcn/dlopenold.c @@ -1,5 +1,5 @@ /* Load a shared object at run time. - 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 @@ -70,7 +70,7 @@ __dlopen_nocheck (const char *file, int mode) mode |= RTLD_LAZY; args.mode = mode; - if (__glibc_unlikely (_dlfcn_hook != NULL)) + if (!rtld_active ()) return _dlfcn_hook->dlopen (file, mode, RETURN_ADDRESS (0)); return _dlerror_run (dlopen_doit, &args) ? NULL : args.new; |