diff --git a/lib/System/DynamicLibrary.cpp b/lib/System/DynamicLibrary.cpp index 3da50a28b65..33f86334e38 100644 --- a/lib/System/DynamicLibrary.cpp +++ b/lib/System/DynamicLibrary.cpp @@ -61,9 +61,19 @@ using namespace llvm::sys; //=== independent code. //===----------------------------------------------------------------------===// -static SmartMutex<true> HandlesMutex; +static SmartMutex<true>* HandlesMutex; static std::vector<void *> *OpenedHandles = 0; +static bool InitializeMutex() { + HandlesMutex = new SmartMutex<true>; + return HandlesMutex != 0; +} + +static bool EnsureMutexInitialized() { + static bool result = InitializeMutex(); + return result; +} + bool DynamicLibrary::LoadLibraryPermanently(const char *Filename, std::string *ErrMsg) { @@ -78,7 +88,8 @@ bool DynamicLibrary::LoadLibraryPermanently(const char *Filename, if (Filename == NULL) H = RTLD_DEFAULT; #endif - SmartScopedLock<true> Lock(HandlesMutex); + EnsureMutexInitialized(); + SmartScopedLock<true> Lock(*HandlesMutex); if (OpenedHandles == 0) OpenedHandles = new std::vector<void *>(); OpenedHandles->push_back(H); @@ -113,7 +124,8 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) { #if HAVE_DLFCN_H // Now search the libraries. - SmartScopedLock<true> Lock(HandlesMutex); + EnsureMutexInitialized(); + SmartScopedLock<true> Lock(*HandlesMutex); if (OpenedHandles) { for (std::vector<void *>::iterator I = OpenedHandles->begin(), E = OpenedHandles->end(); I != E; ++I) {