Implement the default constructor which causes the current program to be
opened as if it was a dynamic library so its symbols can be searched too.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18341 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/System/DynamicLibrary.cpp b/lib/System/DynamicLibrary.cpp
index ca7bee6..477e305 100644
--- a/lib/System/DynamicLibrary.cpp
+++ b/lib/System/DynamicLibrary.cpp
@@ -28,6 +28,16 @@
#ifdef HAVE_LT_DLOPEN
+DynamicLibrary::DynamicLibrary() : handle(0) {
+ if (0 != lt_dlinit())
+ throw std::string(lt_dlerror());
+
+ handle = lt_dlopen(0);
+
+ if (handle == 0)
+ throw std::string("Can't open program as dynamic library");
+}
+
DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) {
if (0 != lt_dlinit())
throw std::string(lt_dlerror());
diff --git a/lib/System/Unix/DynamicLibrary.cpp b/lib/System/Unix/DynamicLibrary.cpp
index c513f51..24d7f5f 100644
--- a/lib/System/Unix/DynamicLibrary.cpp
+++ b/lib/System/Unix/DynamicLibrary.cpp
@@ -16,8 +16,16 @@
namespace llvm {
using namespace sys;
+DynamicLibrary::DynamicLibrary() : handle(0) {
+#if defined (HAVE_DLOPEN)
+ if ((handle = dlopen(0, RTLD_NOW | RTLD_GLOBAL)) == 0)
+ throw std::string( dlerror() );
+#else
+ assert(!"Dynamic object linking not implemented for this platform");
+#endif
+}
-DynamicLibrary::DynamicLibrary(const char *filename) {
+DynamicLibrary::DynamicLibrary(const char *filename) : handle(0) {
#if defined (HAVE_DLOPEN)
if ((handle = dlopen (filename, RTLD_NOW | RTLD_GLOBAL)) == 0)
throw std::string( dlerror() );
diff --git a/lib/System/Win32/DynamicLibrary.cpp b/lib/System/Win32/DynamicLibrary.cpp
index b2add2f..d743454 100644
--- a/lib/System/Win32/DynamicLibrary.cpp
+++ b/lib/System/Win32/DynamicLibrary.cpp
@@ -22,15 +22,21 @@
//=== and must not be UNIX code
//===----------------------------------------------------------------------===//
+DynamicLibrary::DynamicLibrary() : handle(0) {
+ handle = new HMODULE;
+ *((HMODULE*)handle) = GetModuleHandle(NULL);
+
+ if (*((HMODULE*)handle) == 0) {
+ ThrowError("Can't GetModuleHandle: ");
+ }
+}
+
DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) {
handle = new HMODULE;
*((HMODULE*)handle) = LoadLibrary(filename);
if (*((HMODULE*)handle) == 0) {
- char Buffer[100];
- // FIXME: This should use FormatMessage
- sprintf(Buffer, "Windows error code %d\n", GetLastError());
- throw std::string(Buffer);
+ ThrowError("Can't LoadLibrary: ");
}
}
diff --git a/lib/System/Win32/DynamicLibrary.inc b/lib/System/Win32/DynamicLibrary.inc
index b2add2f..d743454 100644
--- a/lib/System/Win32/DynamicLibrary.inc
+++ b/lib/System/Win32/DynamicLibrary.inc
@@ -22,15 +22,21 @@
//=== and must not be UNIX code
//===----------------------------------------------------------------------===//
+DynamicLibrary::DynamicLibrary() : handle(0) {
+ handle = new HMODULE;
+ *((HMODULE*)handle) = GetModuleHandle(NULL);
+
+ if (*((HMODULE*)handle) == 0) {
+ ThrowError("Can't GetModuleHandle: ");
+ }
+}
+
DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) {
handle = new HMODULE;
*((HMODULE*)handle) = LoadLibrary(filename);
if (*((HMODULE*)handle) == 0) {
- char Buffer[100];
- // FIXME: This should use FormatMessage
- sprintf(Buffer, "Windows error code %d\n", GetLastError());
- throw std::string(Buffer);
+ ThrowError("Can't LoadLibrary: ");
}
}