commit 212e0e38248860b151b28877225629a988d95b58
author Elliott Hughes <enh@google.com> Mon Dec 01 16:43:51 2014 -0800
committer Elliott Hughes <enh@google.com> Mon Dec 01 16:43:51 2014 -0800
tree f43f3b8bc2472d2584750052171a0d6da5277e25
parent 076f69d828cfa5d30360e1dd2f24acd751d4a461

Build our benchmarks against glibc too.

Bug: 18556607
Change-Id: I455ac8b93c0835836180e549486bc52d393ee6a6

linker/dlfcn.cpp

diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
index 2486e02..57b2c23 100644
--- a/linker/dlfcn.cpp
+++ b/linker/dlfcn.cpp
@@ -29,7 +29,7 @@
 
 /* This file hijacks the symbols stubbed out in libdl.so. */
 
-static pthread_mutex_t g_dl_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
+static pthread_mutex_t g_dl_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
 
 static const char* __bionic_set_dlerror(char* new_value) {
   char** dlerror_slot = &reinterpret_cast<char**>(__get_tls())[TLS_SLOT_DLERROR];