set TargetOptions before passing to createTargetMachine

jckarter · Jan 22, 2013 · a81b153 · a81b153
1 parent 3a00637
commit a81b153
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/compiler/codegen.cpp b/compiler/codegen.cpp
@@ -7248,18 +7248,18 @@ llvm::TargetMachine *initLLVM(llvm::StringRef targetTriple,
     default : level = llvm::CodeGenOpt::Aggressive; break;
     }
 
-    llvm::TargetMachine *targetMachine = target->createTargetMachine(
-        targetTriple, targetCPU, targetFeatures,
-        llvm::TargetOptions(), reloc, codeModel, level);
-
+    llvm::TargetOptions opts;
     if (optLevel < 2 || debug)
-        targetMachine->Options.NoFramePointerElim = 1;
-
+        opts.NoFramePointerElim = 1;
     if (softFloat) {
-        targetMachine->Options.UseSoftFloat = 1;
-        targetMachine->Options.FloatABIType = llvm::FloatABI::Soft;
+        opts.UseSoftFloat = 1;
+        opts.FloatABIType = llvm::FloatABI::Soft;
     }
 
+    llvm::TargetMachine *targetMachine = target->createTargetMachine(
+        targetTriple, targetCPU, targetFeatures,
+        opts, reloc, codeModel, level);
+
     if (targetMachine != NULL) {
         llvmDataLayout = targetMachine->getDataLayout();
         if (llvmDataLayout == NULL) {