Make constructors target-specific. This fixes problems where the path would

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

diff --git a/lib/System/Win32/DynamicLibrary.inc b/lib/System/Win32/DynamicLibrary.inc
index 287a4c009e688b6109458bcdaa593a8c16b57a96..3cc6a06bb6ce896f243f941b90a490cccca85ebc 100644 (file)
--- a/lib/System/Win32/DynamicLibrary.inc
+++ b/lib/System/Win32/DynamicLibrary.inc
@@ -2,8 +2,8 @@
 // 
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Jeff Cohen 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.
 // 
 //===----------------------------------------------------------------------===//
 //
@@ -37,11 +37,24 @@ using namespace sys;
 
 static std::vector<HMODULE> OpenedHandles;
 
+#ifdef _WIN64
+  typedef DWORD64 ModuleBaseType;
+#else
+  typedef ULONG ModuleBaseType;
+#endif
+
 extern "C" {
+#if !defined(_MSC_VER) || _MSC_VER < 1500
   static BOOL CALLBACK ELM_Callback(PSTR  ModuleName,
-                                    ULONG ModuleBase,
+                                    ModuleBaseType ModuleBase,
+                                    ULONG ModuleSize,
+                                    PVOID UserContext)
+#else
+  static BOOL CALLBACK ELM_Callback(PCSTR  ModuleName,
+                                    ModuleBaseType ModuleBase,
                                     ULONG ModuleSize,
                                     PVOID UserContext)
+#endif
   {
     // Ignore VC++ runtimes prior to 7.1.  Somehow some of them get loaded
     // into the process.
@@ -51,7 +64,11 @@ extern "C" {
         stricmp(ModuleName, "msvcp60") != 0 &&
         stricmp(ModuleName, "msvcp70") != 0 &&
         stricmp(ModuleName, "msvcr70") != 0 &&
+#ifndef __MINGW32__
+        // Mingw32 uses msvcrt.dll by default. Don't ignore it.
+        // Otherwise, user should be aware, what he's doing :)
         stricmp(ModuleName, "msvcrt") != 0 &&
+#endif        
         stricmp(ModuleName, "msvcrt20") != 0 &&
         stricmp(ModuleName, "msvcrt40") != 0) {
       OpenedHandles.push_back((HMODULE)ModuleBase);
@@ -65,16 +82,6 @@ DynamicLibrary::DynamicLibrary() : handle(0) {
   OpenedHandles.push_back((HMODULE)handle);
 }
 
-DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) {
-  HMODULE a_handle = LoadLibrary(filename);
-
-  if (a_handle == 0)
-    ThrowError(std::string(filename) + ": Can't open : ");
-
-  handle = a_handle;
-  OpenedHandles.push_back(a_handle);
-}
-
 DynamicLibrary::~DynamicLibrary() {
   if (handle == 0)
     return;
@@ -93,14 +100,14 @@ DynamicLibrary::~DynamicLibrary() {
     }
   }
 }
-
+ 
 bool DynamicLibrary::LoadLibraryPermanently(const char *filename,
                                             std::string *ErrMsg) {
   if (filename) {
     HMODULE a_handle = LoadLibrary(filename);
 
     if (a_handle == 0)
-      return GetError(std::string(filename) + ": Can't open : ", ErrMsg);
+      return MakeErrMsg(ErrMsg, std::string(filename) + ": Can't open : ");
 
     OpenedHandles.push_back(a_handle);
   } else {
@@ -114,6 +121,24 @@ bool DynamicLibrary::LoadLibraryPermanently(const char *filename,
   return false;
 }
 
+// Stack probing routines are in the support library (e.g. libgcc), but we don't
+// have dynamic linking on windows. Provide a hook.
+#if defined(__MINGW32__) || defined (_MSC_VER)
+  #define EXPLICIT_SYMBOL(SYM)                    \
+    if (!strcmp(symbolName, #SYM)) return (void*)&SYM
+  #define EXPLICIT_SYMBOL2(SYMFROM, SYMTO)        \
+    if (!strcmp(symbolName, #SYMFROM)) return (void*)&SYMTO
+  #define EXPLICIT_SYMBOL_DEF(SYM)                \
+    extern "C" { extern void *SYM; }
+
+  #if defined(__MINGW32__)
+    EXPLICIT_SYMBOL_DEF(_alloca);
+    EXPLICIT_SYMBOL_DEF(__main);
+  #elif defined(_MSC_VER)
+    EXPLICIT_SYMBOL_DEF(_alloca_probe);
+  #endif
+#endif
+
 void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
   // First check symbols added via AddSymbol().
   std::map<std::string, void *>::iterator I = g_symbols.find(symbolName);
@@ -128,12 +153,27 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
       return (void *) ptr;
   }
 
-  return 0;
-}
+#if defined(__MINGW32__)
+  {
+    EXPLICIT_SYMBOL(_alloca);
+    EXPLICIT_SYMBOL(__main);
 
-void *DynamicLibrary::GetAddressOfSymbol(const char *symbolName) {
-  assert(handle != 0 && "Invalid DynamicLibrary handle");
-  return (void *) GetProcAddress((HMODULE)handle, symbolName);
+    EXPLICIT_SYMBOL2(alloca, _alloca);
+#undef EXPLICIT_SYMBOL
+#undef EXPLICIT_SYMBOL2
+#undef EXPLICIT_SYMBOL_DEF    
+  }
+#elif defined(_MSC_VER)
+  {
+    EXPLICIT_SYMBOL2(alloca, _alloca_probe);
+    EXPLICIT_SYMBOL2(_alloca, _alloca_probe);
+#undef EXPLICIT_SYMBOL
+#undef EXPLICIT_SYMBOL2
+#undef EXPLICIT_SYMBOL_DEF    
+  }  
+#endif
+
+  return 0;
 }
 
 }