# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1217077968 -7200
# Node ID b0feb180ce5544f6db762c3e96929478d5c7f1f3
# Parent  38979a6fe480ca8affc2edd5a4ef617f99594091# Parent  71a40b62b408d9a8e86b9c0e22e68bf5219ec64f
Automated merge with http://hg.dsource.org/projects/llvmdc

diff -r 71a40b62b408 -r b0feb180ce55 gen/linker.cpp
--- a/gen/linker.cpp	Sat Jul 26 15:00:57 2008 +0200
+++ b/gen/linker.cpp	Sat Jul 26 15:12:48 2008 +0200
@@ -108,21 +108,22 @@
         switch(global.params.optimizeLevel)
         {
         case 0:
-            s = "-O0"; break;
+            args.push_back("-disable-opt");
+            args.push_back("-globaldce");
+            break;
         case 1:
-            s = "-O1"; break;
+            args.push_back("-disable-opt");
+            args.push_back("-globaldce");
+            args.push_back("-mem2reg");
         case 2:
-            s = "-O2"; break;
         case 3:
-            s = "-O3"; break;
         case 4:
-            s = "-O4"; break;
         case 5:
-            s = "-O5"; break;
+            // use default optimization
+            break;
         default:
             assert(0);
         }
-        args.push_back(s);
     }
 
     // inlining
@@ -156,6 +157,10 @@
         args.push_back("-ldl");
         args.push_back("-lm");
     }
+    else if (global.params.isWindows)
+    {
+        // FIXME: I'd assume kernel32 etc
+    }
 
     // object files
     for (int i = 0; i < global.params.objfiles->dim; i++)
diff -r 71a40b62b408 -r b0feb180ce55 gen/toobj.cpp
--- a/gen/toobj.cpp	Sat Jul 26 15:00:57 2008 +0200
+++ b/gen/toobj.cpp	Sat Jul 26 15:12:48 2008 +0200
@@ -175,7 +175,7 @@
 
     // write bytecode
     {
-        Logger::println("Writing LLVM bitcode\n");
+        Logger::println("Writing LLVM bitcode to: %s\n", bcpath.c_str());
         std::ofstream bos(bcpath.c_str(), std::ios::binary);
         llvm::WriteBitcodeToFile(ir.module, bos);
     }
diff -r 71a40b62b408 -r b0feb180ce55 lib/.empty
diff -r 71a40b62b408 -r b0feb180ce55 llvmdc.kdevelop.filelist
--- a/llvmdc.kdevelop.filelist	Sat Jul 26 15:00:57 2008 +0200
+++ b/llvmdc.kdevelop.filelist	Sat Jul 26 15:12:48 2008 +0200
@@ -58,8 +58,6 @@
 dmd/mangle.c
 dmd/mars.c
 dmd/mars.h
-dmd/md5.c
-dmd/md5.h
 dmd/mem.c
 dmd/mem.h
 dmd/module.c