commit dff247868a3f292c1fc0daeb3f22cdcfb4c156d5
author Peter Collingbourne <peter@pcc.me.uk> Wed Dec 07 23:58:57 2011 +0000
committer Peter Collingbourne <peter@pcc.me.uk> Wed Dec 07 23:58:57 2011 +0000
tree 4d8b8f2b886d9253d8dbb5b2823ad7aea16d405b
parent 42ee1522b6fa9b138dfccbf2a0e50a49a50ccf60

EngineBuilder: support for custom TargetOptions.  Fixes the
ExceptionDemo example.

llvm-svn: 146108

llvm/lib/ExecutionEngine/TargetSelect.cpp

diff --git a/llvm/lib/ExecutionEngine/TargetSelect.cpp b/llvm/lib/ExecutionEngine/TargetSelect.cpp
index 9a0d41d..ea93a77 100644
--- a/llvm/lib/ExecutionEngine/TargetSelect.cpp
+++ b/llvm/lib/ExecutionEngine/TargetSelect.cpp
@@ -30,6 +30,7 @@
                               StringRef MArch,
                               StringRef MCPU,
                               const SmallVectorImpl<std::string>& MAttrs,
+                              const TargetOptions &Options,
                               Reloc::Model RM,
                               CodeModel::Model CM,
                               CodeGenOpt::Level OL,
@@ -86,7 +87,6 @@
   }
 
   // Allocate a target...
-  TargetOptions Options;
   TargetMachine *Target = TheTarget->createTargetMachine(TheTriple.getTriple(),
                                                          MCPU, FeaturesStr,
                                                          Options,