#include "llvm/System/DynamicLibrary.h"
#include "llvm/Config/config.h"
+#include <cstdio>
#include <cstring>
#include <map>
// Collection of symbol name/value pairs to be searched prior to any libraries.
-static std::map<std::string, void *> g_symbols;
+std::map<std::string, void *> &g_symbols() {
+ static std::map<std::string, void *> symbols;
+ return symbols;
+}
void llvm::sys::DynamicLibrary::AddSymbol(const char* symbolName,
void *symbolValue) {
- g_symbols[symbolName] = symbolValue;
+ g_symbols()[symbolName] = symbolValue;
}
// It is not possible to use ltdl.c on VC++ builds as the terms of its LGPL
//static std::vector<lt_dlhandle> OpenedHandles;
static std::vector<void *> OpenedHandles;
-DynamicLibrary::DynamicLibrary() : handle(0) {}
+DynamicLibrary::DynamicLibrary() {}
DynamicLibrary::~DynamicLibrary() {
while(!OpenedHandles.empty()) {
bool DynamicLibrary::LoadLibraryPermanently(const char *Filename,
std::string *ErrMsg) {
- void *H = dlopen(Filename, RTLD_LAZY);
+ void *H = dlopen(Filename, RTLD_LAZY|RTLD_GLOBAL);
if (H == 0) {
- ErrMsg = new std::string(dlerror());
+ if (ErrMsg)
+ *ErrMsg = dlerror();
return true;
}
OpenedHandles.push_back(H);
// check_ltdl_initialization();
// First check symbols added via AddSymbol().
- std::map<std::string, void *>::iterator I = g_symbols.find(symbolName);
- if (I != g_symbols.end())
+ std::map<std::string, void *>::iterator I = g_symbols().find(symbolName);
+ if (I != g_symbols().end())
return I->second;
// Now search the libraries.
#ifdef __CYGWIN__
{
EXPLICIT_SYMBOL(_alloca);
+ EXPLICIT_SYMBOL(__main);
}
#endif
return 0;
}
-void *DynamicLibrary::GetAddressOfSymbol(const char *symbolName) {
- assert(handle != 0 && "Invalid DynamicLibrary handle");
- return dlsym(handle, symbolName);
-}
-
#endif // LLVM_ON_WIN32
-
-DEFINING_FILE_FOR(SystemDynamicLibrary)