# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1220375677 -7200
# Node ID f75b16f1e405b15a00047e4505c63796ca696ea3
# Parent  68d7df3f9b05bffc1cf8573ee6f4194909fc36d8# Parent  aaba4f7c6d8a87f95b62ef3ad94c80e3cd298f9a
Automated merge with http://hg.dsource.org/projects/llvmdc

diff -r aaba4f7c6d8a -r f75b16f1e405 dmd/mars.c
--- a/dmd/mars.c	Tue Sep 02 19:14:25 2008 +0200
+++ b/dmd/mars.c	Tue Sep 02 19:14:37 2008 +0200
@@ -337,6 +337,8 @@
 #error
 #endif /* linux */
 
+    assert(global.params.os != OSinvalid);
+
     //VersionCondition::addPredefinedGlobalIdent("D_Bits");
     VersionCondition::addPredefinedGlobalIdent("all");
 
@@ -786,6 +788,8 @@
         assert(0 && "Invalid arch");
     }
 
+    assert(global.params.cpu != ARCHinvalid);
+
     if (allowForceEndianness && global.params.forceBE) {
         VersionCondition::addPredefinedGlobalIdent("BigEndian");
         global.params.isLE = false;
diff -r aaba4f7c6d8a -r f75b16f1e405 dmd/mars.h
--- a/dmd/mars.h	Tue Sep 02 19:14:25 2008 +0200
+++ b/dmd/mars.h	Tue Sep 02 19:14:37 2008 +0200
@@ -40,6 +40,7 @@
 // LLVMDC
 enum ARCH
 {
+    ARCHinvalid,
     ARCHx86,
     ARCHx86_64,
     ARCHppc,
@@ -48,6 +49,7 @@
 
 enum OS
 {
+    OSinvalid,
     OSLinux,
     OSWindows,
     OSMacOSX
diff -r aaba4f7c6d8a -r f75b16f1e405 gen/toobj.cpp
--- a/gen/toobj.cpp	Tue Sep 02 19:14:25 2008 +0200
+++ b/gen/toobj.cpp	Tue Sep 02 19:14:37 2008 +0200
@@ -192,7 +192,7 @@
     if (global.params.disassemble) {
         Logger::println("Writing LLVM asm to: %s\n", llfile->name->toChars());
         std::ofstream aos(llpath.c_str());
-        ir.module->print(aos);
+        ir.module->print(aos, NULL);
     }
 
     delete ir.module;
diff -r aaba4f7c6d8a -r f75b16f1e405 runtime/internal/critical.c
--- a/runtime/internal/critical.c	Tue Sep 02 19:14:25 2008 +0200
+++ b/runtime/internal/critical.c	Tue Sep 02 19:14:37 2008 +0200
@@ -81,7 +81,7 @@
 #include	<stdlib.h>
 #include	<pthread.h>
 
-#if __APPLE__
+#if !linux
 #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
 #endif
 
diff -r aaba4f7c6d8a -r f75b16f1e405 runtime/internal/monitor.c
--- a/runtime/internal/monitor.c	Tue Sep 02 19:14:25 2008 +0200
+++ b/runtime/internal/monitor.c	Tue Sep 02 19:14:37 2008 +0200
@@ -127,7 +127,7 @@
 
 #if USE_PTHREADS
 
-#if __APPLE__
+#if !linux
 #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
 #endif