From 5ddcdea5f20764a1cb77f1e0839e8e6238a476f5 Mon Sep 17 00:00:00 2001 From: Tomas Lindquist Olsen Date: Thu, 24 Jul 2008 00:35:46 +0200 Subject: [PATCH 1/2] Added empty file to lib dir so it get's created by hg --- lib/.empty | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/.empty diff --git a/lib/.empty b/lib/.empty new file mode 100644 index 00000000..e69de29b From 70f16e36fb88d513a94d3f6d548b7a632251319a Mon Sep 17 00:00:00 2001 From: Tomas Lindquist Olsen Date: Sat, 26 Jul 2008 15:02:57 +0200 Subject: [PATCH 2/2] Added bitcode filename to very verbose logging. Fixed -O switches from llvm 2.4. Removed md5 from the kdevelop project filelist. --- gen/linker.cpp | 19 ++++++++++++------- gen/toobj.cpp | 2 +- llvmdc.kdevelop.filelist | 2 -- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gen/linker.cpp b/gen/linker.cpp index c6a1c199..98fb17fe 100644 --- a/gen/linker.cpp +++ b/gen/linker.cpp @@ -108,21 +108,22 @@ int linkExecutable(const char* argv0) 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 @@ int linkExecutable(const char* argv0) 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 --git a/gen/toobj.cpp b/gen/toobj.cpp index d357decd..127a19b9 100644 --- a/gen/toobj.cpp +++ b/gen/toobj.cpp @@ -175,7 +175,7 @@ void Module::genobjfile(int multiobj) // 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 --git a/llvmdc.kdevelop.filelist b/llvmdc.kdevelop.filelist index 2cdbb9a2..3377f550 100644 --- a/llvmdc.kdevelop.filelist +++ b/llvmdc.kdevelop.filelist @@ -58,8 +58,6 @@ dmd/macro.h dmd/mangle.c dmd/mars.c dmd/mars.h -dmd/md5.c -dmd/md5.h dmd/mem.c dmd/mem.h dmd/module.c