//
// The LLVM Compiler Infrastructure
//
-// This file was developed by Reid Spencer and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
#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
#else
-#include "ltdl.h"
+//#include "ltdl.h"
+#include <dlfcn.h>
#include <cassert>
using namespace llvm;
using namespace llvm::sys;
//=== independent code.
//===----------------------------------------------------------------------===//
-static inline void check_ltdl_initialization() {
- static bool did_initialize_ltdl = false;
- if (!did_initialize_ltdl) {
- int Err = lt_dlinit();
- Err = Err; // Silence warning.
- assert(0 == Err && "Can't init the ltdl library");
- did_initialize_ltdl = true;
- }
-}
-
-static std::vector<lt_dlhandle> OpenedHandles;
-
-DynamicLibrary::DynamicLibrary() : handle(0) {
- check_ltdl_initialization();
-
- lt_dlhandle a_handle = lt_dlopen(0);
-
- assert(a_handle == 0 || "Can't open program as dynamic library");
-
- handle = a_handle;
- OpenedHandles.push_back(a_handle);
-}
+//static std::vector<lt_dlhandle> OpenedHandles;
+static std::vector<void *> OpenedHandles;
-/*
-DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) {
- check_ltdl_initialization();
-
- lt_dlhandle a_handle = lt_dlopen(filename);
-
- if (a_handle == 0)
- a_handle = lt_dlopenext(filename);
-
- if (a_handle == 0)
- throw std::string("Can't open :") + filename + ": " + lt_dlerror();
-
- handle = a_handle;
- OpenedHandles.push_back(a_handle);
-}
-*/
+DynamicLibrary::DynamicLibrary() {}
DynamicLibrary::~DynamicLibrary() {
- lt_dlhandle a_handle = (lt_dlhandle) handle;
- if (a_handle) {
- lt_dlclose(a_handle);
-
- for (std::vector<lt_dlhandle>::iterator I = OpenedHandles.begin(),
- E = OpenedHandles.end(); I != E; ++I) {
- if (*I == a_handle) {
- // Note: don't use the swap/pop_back trick here. Order is important.
- OpenedHandles.erase(I);
- return;
- }
- }
+ while(!OpenedHandles.empty()) {
+ void *H = OpenedHandles.back(); OpenedHandles.pop_back();
+ dlclose(H);
}
}
bool DynamicLibrary::LoadLibraryPermanently(const char *Filename,
std::string *ErrMsg) {
- check_ltdl_initialization();
- lt_dlhandle a_handle = lt_dlopen(Filename);
-
- if (a_handle == 0)
- a_handle = lt_dlopenext(Filename);
-
- if (a_handle == 0) {
+ void *H = dlopen(Filename, RTLD_LAZY|RTLD_GLOBAL);
+ if (H == 0) {
if (ErrMsg)
- *ErrMsg = std::string("Can't open :") +
- (Filename ? Filename : "<current process>") + ": " + lt_dlerror();
+ *ErrMsg = dlerror();
return true;
}
-
- lt_dlmakeresident(a_handle);
-
- OpenedHandles.push_back(a_handle);
+ OpenedHandles.push_back(H);
return false;
}
void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
- check_ltdl_initialization();
+ // 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.
- for (std::vector<lt_dlhandle>::iterator I = OpenedHandles.begin(),
+ for (std::vector<void *>::iterator I = OpenedHandles.begin(),
E = OpenedHandles.end(); I != E; ++I) {
- lt_ptr ptr = lt_dlsym(*I, symbolName);
+ //lt_ptr ptr = lt_dlsym(*I, symbolName);
+ void *ptr = dlsym(*I, symbolName);
if (ptr)
return ptr;
}
+#define EXPLICIT_SYMBOL(SYM) \
+ extern void *SYM; if (!strcmp(symbolName, #SYM)) return &SYM
+
// If this is darwin, it has some funky issues, try to solve them here. Some
// important symbols are marked 'private external' which doesn't allow
// SearchForAddressOfSymbol to find them. As such, we special case them here,
// there is only a small handful of them.
#ifdef __APPLE__
-#define EXPLICIT_SYMBOL(SYM) \
- extern void *SYM; if (!strcmp(symbolName, #SYM)) return &SYM
{
EXPLICIT_SYMBOL(__ashldi3);
EXPLICIT_SYMBOL(__ashrdi3);
EXPLICIT_SYMBOL(__udivdi3);
EXPLICIT_SYMBOL(__umoddi3);
}
-#undef EXPLICIT_SYMBOL
#endif
+#ifdef __CYGWIN__
+ {
+ EXPLICIT_SYMBOL(_alloca);
+ EXPLICIT_SYMBOL(__main);
+ }
+#endif
+
+#undef EXPLICIT_SYMBOL
+
// This macro returns the address of a well-known, explicit symbol
#define EXPLICIT_SYMBOL(SYM) \
if (!strcmp(symbolName, #SYM)) return &SYM
return 0;
}
-void *DynamicLibrary::GetAddressOfSymbol(const char *symbolName) {
- assert(handle != 0 && "Invalid DynamicLibrary handle");
- return lt_dlsym((lt_dlhandle) handle, symbolName);
-}
-
#endif // LLVM_ON_WIN32
-
-DEFINING_FILE_FOR(SystemDynamicLibrary)
projects / oota-llvm.git / blobdiff