diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:01:57 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:01:57 +0000 |
| commit | cab56836b146bc129f1ad43f0393d95a9deca63a (patch) | |
| tree | 4f4e655319bbac78fca170da05275c127429b460 /dlfcn/dlsym.c | |
| parent | 04ac1241a4cd004872282c2c82ec37fa33925292 (diff) | |
| parent | 82dd75a7f436a19047325d62182590c9f9e23a78 (diff) | |
Merge branch 't/tls' into refs/top-bases/t/tls-threadvar
Diffstat (limited to 'dlfcn/dlsym.c')
| -rw-r--r-- | dlfcn/dlsym.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dlfcn/dlsym.c b/dlfcn/dlsym.c index e72202e68f..285abaaa4e 100644 --- a/dlfcn/dlsym.c +++ b/dlfcn/dlsym.c @@ -1,5 +1,5 @@ /* Look up a 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 @@ -55,7 +55,7 @@ void * __dlsym (void *handle, const char *name DL_CALLER_DECL) { # ifdef SHARED - if (__glibc_unlikely (_dlfcn_hook != NULL)) + if (!rtld_active ()) return _dlfcn_hook->dlsym (handle, name, DL_CALLER); # endif |