[llvm-commits] CVS: llvm/lib/System/Win32/DynamicLibrary.inc Process.inc Signals.inc

[Reid Spencer]

Changes in directory llvm/lib/System/Win32:

DynamicLibrary.inc updated: 1.14 -> 1.15
Process.inc updated: 1.12 -> 1.13
Signals.inc updated: 1.19 -> 1.20
---
Log message:

Provide configuration support and usage for MINGW32 platform


---
Diffs of the changes:  (+26 -8)

 DynamicLibrary.inc |   12 +++++++++---
 Process.inc        |    8 +++++++-
 Signals.inc        |   14 ++++++++++----
 3 files changed, 26 insertions(+), 8 deletions(-)


Index: llvm/lib/System/Win32/DynamicLibrary.inc
diff -u llvm/lib/System/Win32/DynamicLibrary.inc:1.14 llvm/lib/System/Win32/DynamicLibrary.inc:1.15
--- llvm/lib/System/Win32/DynamicLibrary.inc:1.14	Sun Jan 29 22:33:51 2006
+++ llvm/lib/System/Win32/DynamicLibrary.inc	Thu Jun  1 14:03:21 2006
@@ -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;


Index: llvm/lib/System/Win32/Process.inc
diff -u llvm/lib/System/Win32/Process.inc:1.12 llvm/lib/System/Win32/Process.inc:1.13
--- llvm/lib/System/Win32/Process.inc:1.12	Thu May  5 17:33:09 2005
+++ llvm/lib/System/Win32/Process.inc	Thu Jun  1 14:03:21 2006
@@ -16,7 +16,13 @@
 #include <malloc.h>
 #include <io.h>
 
-#pragma comment(lib, "psapi.lib")
+#ifdef __MINGW32__
+ #if (HAVE_LIBPSAPI != 1)
+  #error "libpsapi.a should be present"
+ #endif
+#else
+ #pragma comment(lib, "psapi.lib")
+#endif
 
 //===----------------------------------------------------------------------===//
 //=== WARNING: Implementation here must contain only Win32 specific code 


Index: llvm/lib/System/Win32/Signals.inc
diff -u llvm/lib/System/Win32/Signals.inc:1.19 llvm/lib/System/Win32/Signals.inc:1.20
--- llvm/lib/System/Win32/Signals.inc:1.19	Mon Aug  1 22:26:32 2005
+++ llvm/lib/System/Win32/Signals.inc	Thu Jun  1 14:03:21 2006
@@ -16,14 +16,20 @@
 #include <vector>
 
 #ifdef __MINGW32__
-#include <imagehlp.h>
+ #include <imagehlp.h>
 #else
-#include <dbghelp.h>
+ #include <dbghelp.h>
 #endif
 #include <psapi.h>
 
-#pragma comment(lib, "psapi.lib")
-#pragma comment(lib, "dbghelp.lib")
+#ifdef __MINGW32__
+ #if ((HAVE_LIBIMAGEHLP != 1) || (HAVE_LIBPSAPI != 1))
+  #error "libimagehlp.a & libpsapi.a should be present"
+ #endif
+#else
+ #pragma comment(lib, "psapi.lib")
+ #pragma comment(lib, "dbghelp.lib")
+#endif
 
 // Forward declare.
 static LONG WINAPI LLVMUnhandledExceptionFilter(LPEXCEPTION_POINTERS ep);