diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:36:51 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:36:51 +0000 |
| commit | 05fa8834c6644f12405ea713c48693bf2d1864f1 (patch) | |
| tree | c6b6391884370c75972a2e432d42ebbb076a0cdf /dlfcn/dlmopen.c | |
| parent | 525c181a5a9a95e24d2111b7792608151a40eb84 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmemt/bigmem
Diffstat (limited to 'dlfcn/dlmopen.c')
| -rw-r--r-- | dlfcn/dlmopen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dlfcn/dlmopen.c b/dlfcn/dlmopen.c index 6da0d0d691..87ba290464 100644 --- a/dlfcn/dlmopen.c +++ b/dlfcn/dlmopen.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 @@ -60,12 +60,12 @@ dlmopen_doit (void *a) must be the main one. */ if (args->file == NULL) # endif - GLRO(dl_signal_error) (EINVAL, NULL, NULL, N_("invalid namespace")); + _dl_signal_error (EINVAL, NULL, NULL, N_("invalid namespace")); /* It makes no sense to use RTLD_GLOBAL when loading a DSO into a namespace other than the base namespace. */ if (__glibc_unlikely (args->mode & RTLD_GLOBAL)) - GLRO(dl_signal_error) (EINVAL, NULL, NULL, N_("invalid mode")); + _dl_signal_error (EINVAL, NULL, NULL, N_("invalid mode")); } args->new = GLRO(dl_open) (args->file ?: "", args->mode | __RTLD_DLOPEN, @@ -79,7 +79,7 @@ void * __dlmopen (Lmid_t nsid, const char *file, int mode DL_CALLER_DECL) { # ifdef SHARED - if (__glibc_unlikely (_dlfcn_hook != NULL)) + if (!rtld_active ()) return _dlfcn_hook->dlmopen (nsid, file, mode, RETURN_ADDRESS (0)); # endif |