Mercurial > projects > ldc

diff gen/toobj.cpp @ 986:a8cb25d478c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use LLVM-style command line (instead of DMD-style) Note: For a backward compatible interface, use the new bin/ldmd script. It supports all old options while passing on anything it doesn't recognize. Some changes caused by this: * -debug and -version are now -d-debug and -d-version due to a conflict with standard LLVM options. * All "flag" options now allow an optional =true/=1/=false/=0 suffix. * Some "hidden debug switches" starting with "--" were renamed because LLVM doesn't care about the number of dashes, so they were conflicting with other options (such as -c). The new versions start with "-hidden-debug-" instead of "--" * --help works, but has a non-zero exit code. This breaks some Tango scripts which use it to test for compiler existence. See tango.patch. Some changes not (directly) caused by this; * (-enable/-disable)-FOO options are now available for pre- and postconditions. * -march is used instead of -m (like other LLVM programs), but -m is an alias for it. * -defaultlib, -debuglib, -d-debug and -d-version allow comma-separated values. The effect should be identical to specifying the same option multiple times. I decided against allowing these for some other options because paths might contain commas on some systems. * -fPIC is removed in favor of the standard LLVM option -relocation-model=pic Bug: * If -run is specified as the last argument in DFLAGS, no error is generated. (Not very serious IMHO)
author Frits van Bommel <fvbommel wxs.nl>
date Wed, 25 Feb 2009 17:34:51 +0100
parents e71c61befd6d
children 2667e3a145be
line wrap: on
line diff
--- a/gen/toobj.cpp	Thu Feb 19 13:51:44 2009 +0100
+++ b/gen/toobj.cpp	Wed Feb 25 17:34:51 2009 +0100
@@ -24,6 +24,7 @@
 #include "llvm/System/Program.h"
 #include "llvm/System/Path.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/CommandLine.h"
 
 #include "mars.h"
 #include "module.h"
@@ -55,6 +56,12 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
+static llvm::cl::opt<bool> noVerify("noverify",
+    llvm::cl::desc("Do not run the validation pass before writing bitcode"),
+    llvm::cl::ZeroOrMore);
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
 // in gen/optimize.cpp
 void ldc_optimize_module(llvm::Module* m, char lvl, bool doinline);
 
@@ -124,10 +131,6 @@
 //    for (unsigned i = 0; i != MAttrs.size(); ++i)
 //      Features.AddFeature(MAttrs[i]);
 
-    // only generate PIC code when -fPIC switch is used
-    if (global.params.pic)
-        llvm::TargetMachine::setRelocationModel(llvm::Reloc::PIC_);
-
     // allocate the target machine
     std::auto_ptr<llvm::TargetMachine> target(MArch->CtorFn(*ir.module, Features.getString()));
     assert(target.get() && "Could not allocate target machine!");
@@ -182,7 +185,7 @@
     }
 
     // verify the llvm
-    if (!global.params.novalidate) {
+    if (!noVerify) {
         std::string verifyErr;
         Logger::println("Verifying module...");
         LOG_SCOPE;
@@ -200,7 +203,7 @@
     ldc_optimize_module(ir.module, global.params.optimizeLevel, global.params.llvmInline);
 
     // verify the llvm
-    if (!global.params.novalidate && (global.params.optimizeLevel >= 0 || global.params.llvmInline)) {
+    if (!noVerify && (global.params.optimizeLevel >= 0 || global.params.llvmInline)) {
         std::string verifyErr;
         Logger::println("Verifying module... again...");
         LOG_SCOPE;