For PR797:

[oota-llvm.git] / lib / System / Win32 / DynamicLibrary.inc

diff --git a/lib/System/Win32/DynamicLibrary.inc b/lib/System/Win32/DynamicLibrary.inc
index 2209e592091d8b313ebdcd96ffb05343e33bc173..287a4c009e688b6109458bcdaa593a8c16b57a96 100644 (file)
--- a/lib/System/Win32/DynamicLibrary.inc
+++ b/lib/System/Win32/DynamicLibrary.inc
@@ -14,12 +14,18 @@
 #include "Win32.h"
 
 #ifdef __MINGW32__
-#include <imagehlp.h>
+ #include <imagehlp.h>
 #else
-#include <dbghelp.h>
+ #include <dbghelp.h>
 #endif
 
-#pragma comment(lib, "dbghelp.lib")
+#ifdef __MINGW32__
+ #if (HAVE_LIBIMAGEHLP != 1)
+  #error "libimagehlp.a should be present"
+ #endif
+#else
+ #pragma comment(lib, "dbghelp.lib")
+#endif
 
 namespace llvm {
 using namespace sys;
@@ -88,25 +94,33 @@ DynamicLibrary::~DynamicLibrary() {
   }
 }
 
-void DynamicLibrary::LoadLibraryPermanently(const char* filename) {
+bool DynamicLibrary::LoadLibraryPermanently(const char *filename,
+                                            std::string *ErrMsg) {
   if (filename) {
     HMODULE a_handle = LoadLibrary(filename);
 
-       if (a_handle == 0)
-               ThrowError(std::string(filename) + ": Can't open : ");
+    if (a_handle == 0)
+      return GetError(std::string(filename) + ": Can't open : ", ErrMsg);
 
-       OpenedHandles.push_back(a_handle);
+    OpenedHandles.push_back(a_handle);
   } else {
-       // When no file is specified, enumerate all DLLs and EXEs in the
+    // When no file is specified, enumerate all DLLs and EXEs in the
     // process.
     EnumerateLoadedModules(GetCurrentProcess(), ELM_Callback, 0);
   }
 
   // Because we don't remember the handle, we will never free it; hence,
   // it is loaded permanently.
+  return false;
 }
 
 void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
+  // First check symbols added via AddSymbol().
+  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<HMODULE>::iterator I = OpenedHandles.begin(),
        E = OpenedHandles.end(); I != E; ++I) {
     FARPROC ptr = GetProcAddress((HMODULE)*I, symbolName);
@@ -124,4 +138,3 @@ void *DynamicLibrary::GetAddressOfSymbol(const char *symbolName) {
 
 }
 
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab