diff options
Diffstat (limited to 'dlfcn')
| -rw-r--r-- | dlfcn/dladdr.c | 2 | ||||
| -rw-r--r-- | dlfcn/dladdr1.c | 2 | ||||
| -rw-r--r-- | dlfcn/dlclose.c | 2 | ||||
| -rw-r--r-- | dlfcn/dlerror.c | 2 | ||||
| -rw-r--r-- | dlfcn/dlinfo.c | 2 | ||||
| -rw-r--r-- | dlfcn/dlmopen.c | 2 | ||||
| -rw-r--r-- | dlfcn/dlopen.c | 2 | ||||
| -rw-r--r-- | dlfcn/dlopenold.c | 2 | ||||
| -rw-r--r-- | dlfcn/dlsym.c | 2 | ||||
| -rw-r--r-- | dlfcn/dlvsym.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/dlfcn/dladdr.c b/dlfcn/dladdr.c index ead117326f..d188d0e289 100644 --- a/dlfcn/dladdr.c +++ b/dlfcn/dladdr.c @@ -24,7 +24,7 @@ int __dladdr (const void *address, Dl_info *info) { #ifdef SHARED - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->dladdr (address, info); #endif return _dl_addr (address, info, NULL, NULL); diff --git a/dlfcn/dladdr1.c b/dlfcn/dladdr1.c index 5dadfd1220..e0c9526c90 100644 --- a/dlfcn/dladdr1.c +++ b/dlfcn/dladdr1.c @@ -24,7 +24,7 @@ int __dladdr1 (const void *address, Dl_info *info, void **extra, int flags) { #ifdef SHARED - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->dladdr1 (address, info, extra, flags); #endif diff --git a/dlfcn/dlclose.c b/dlfcn/dlclose.c index a9921c3169..aab88c47fc 100644 --- a/dlfcn/dlclose.c +++ b/dlfcn/dlclose.c @@ -24,7 +24,7 @@ int __dlclose (void *handle) { #ifdef SHARED - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->dlclose (handle); #endif diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c index 3bf6049e3c..b899d252a1 100644 --- a/dlfcn/dlerror.c +++ b/dlfcn/dlerror.c @@ -32,7 +32,7 @@ char * __dlerror (void) { # ifdef SHARED - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->dlerror (); # endif diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c index fc63c02681..068db5260c 100644 --- a/dlfcn/dlinfo.c +++ b/dlfcn/dlinfo.c @@ -89,7 +89,7 @@ dlinfo_implementation (void *handle, int request, void *arg) int ___dlinfo (void *handle, int request, void *arg) { - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->dlinfo (handle, request, arg); else return dlinfo_implementation (handle, request, arg); diff --git a/dlfcn/dlmopen.c b/dlfcn/dlmopen.c index 2437f5ce22..b41778f16c 100644 --- a/dlfcn/dlmopen.c +++ b/dlfcn/dlmopen.c @@ -80,7 +80,7 @@ dlmopen_implementation (Lmid_t nsid, const char *file, int mode, void * ___dlmopen (Lmid_t nsid, const char *file, int mode) { - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->dlmopen (nsid, file, mode, RETURN_ADDRESS (0)); else return dlmopen_implementation (nsid, file, mode, RETURN_ADDRESS (0)); diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c index 846ca38338..2696dde4b1 100644 --- a/dlfcn/dlopen.c +++ b/dlfcn/dlopen.c @@ -75,7 +75,7 @@ dlopen_implementation (const char *file, int mode, void *dl_caller) void * ___dlopen (const char *file, int mode) { - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->dlopen (file, mode, RETURN_ADDRESS (0)); else return dlopen_implementation (file, mode, RETURN_ADDRESS (0)); diff --git a/dlfcn/dlopenold.c b/dlfcn/dlopenold.c index 67601434df..5c21a00496 100644 --- a/dlfcn/dlopenold.c +++ b/dlfcn/dlopenold.c @@ -70,7 +70,7 @@ __dlopen_nocheck (const char *file, int mode) mode |= RTLD_LAZY; args.mode = mode; - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->dlopen (file, mode, RETURN_ADDRESS (0)); return _dlerror_run (dlopen_doit, &args) ? NULL : args.new; diff --git a/dlfcn/dlsym.c b/dlfcn/dlsym.c index a71f8ae247..2e9ff98e79 100644 --- a/dlfcn/dlsym.c +++ b/dlfcn/dlsym.c @@ -62,7 +62,7 @@ dlsym_implementation (void *handle, const char *name, void *dl_caller) void * ___dlsym (void *handle, const char *name) { - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->dlsym (handle, name, RETURN_ADDRESS (0)); else return dlsym_implementation (handle, name, RETURN_ADDRESS (0)); diff --git a/dlfcn/dlvsym.c b/dlfcn/dlvsym.c index 72219d6da6..caa46ba1e0 100644 --- a/dlfcn/dlvsym.c +++ b/dlfcn/dlvsym.c @@ -65,7 +65,7 @@ dlvsym_implementation (void *handle, const char *name, const char *version, void * ___dlvsym (void *handle, const char *name, const char *version) { - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->dlvsym (handle, name, version, RETURN_ADDRESS (0)); else |