diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:41:39 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:41:39 +0000 |
| commit | 16c9ca827cd735002dec5689f93f22fc358d6f56 (patch) | |
| tree | fbfaa8e020a3a762a96c4f219d4150e369e00099 /dlfcn/dlopen.c | |
| parent | daa262720d3dc357a298b18a359551994082c9b3 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/bits_atomic.h_multiple_threads' into t/bits_atomic.h_multiple_threadst/bits_atomic.h_multiple_threads
Diffstat (limited to 'dlfcn/dlopen.c')
| -rw-r--r-- | dlfcn/dlopen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c index 453efbd1c0..95bc62b6b5 100644 --- a/dlfcn/dlopen.c +++ b/dlfcn/dlopen.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 @@ -61,7 +61,7 @@ dlopen_doit (void *a) if (args->mode & ~(RTLD_BINDING_MASK | RTLD_NOLOAD | RTLD_DEEPBIND | RTLD_GLOBAL | RTLD_LOCAL | RTLD_NODELETE | __RTLD_SPROF)) - GLRO(dl_signal_error) (0, NULL, NULL, _("invalid mode parameter")); + _dl_signal_error (0, NULL, NULL, _("invalid mode parameter")); args->new = GLRO(dl_open) (args->file ?: "", args->mode | __RTLD_DLOPEN, args->caller, @@ -74,7 +74,7 @@ void * __dlopen (const char *file, int mode DL_CALLER_DECL) { # ifdef SHARED - if (__glibc_unlikely (_dlfcn_hook != NULL)) + if (!rtld_active ()) return _dlfcn_hook->dlopen (file, mode, DL_CALLER); # endif |