diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-23 11:20:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-23 11:20:49 -0800 |
| commit | 76ab561b4dd30711d82060d66b599aece0a40878 (patch) | |
| tree | 7eadddc6f0ef70a8a82325160ff8aa5781830a7a /linker | |
| parent | f1a17e762b6fab449cff3006178e42b68e8e241e (diff) | |
| parent | 49a05c060acd4d3e17b2819f00a694271bf40977 (diff) | |
| download | bionic-76ab561b4dd30711d82060d66b599aece0a40878.zip bionic-76ab561b4dd30711d82060d66b599aece0a40878.tar.gz bionic-76ab561b4dd30711d82060d66b599aece0a40878.tar.bz2 | |
am 49a05c06: am 62daffe1: am f9c5afb1: Merge "Redesign dlopen() locks to be recursive per thread."
* commit '49a05c060acd4d3e17b2819f00a694271bf40977':
Redesign dlopen() locks to be recursive per thread.
Diffstat (limited to 'linker')
| -rw-r--r-- | linker/dlfcn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linker/dlfcn.c b/linker/dlfcn.c index 529511f..ac7e5d3 100644 --- a/linker/dlfcn.c +++ b/linker/dlfcn.c @@ -42,7 +42,7 @@ static const char *dl_errors[] = { #define likely(expr) __builtin_expect (expr, 1) #define unlikely(expr) __builtin_expect (expr, 0) -static pthread_mutex_t dl_lock = PTHREAD_MUTEX_INITIALIZER; +pthread_mutex_t dl_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER; static void set_dlerror(int err) { |