commit 029057e3fe74548f64ced090600205df08ef5d32
author Shih-wei Liao <sliao@google.com> Sat Jul 02 11:34:35 2011 -0700
committer Shih-wei Liao <sliao@google.com> Sat Jul 02 11:34:35 2011 -0700
tree dbfab585090693779d2090e1c2bf7fafa74e20f4
parent d50be3231d4d2e4d7ca96b892b04f2d71af8a398

Fix API changes of llvm::SubtargetFeatures.

Change-Id: Ia427295ac8aab71228cee1abfa1ebc5e30fd2078

lib/ExecutionEngine/Compiler.cpp

diff --git a/lib/ExecutionEngine/Compiler.cpp b/lib/ExecutionEngine/Compiler.cpp
index ffa7311..9d13039 100644
--- a/lib/ExecutionEngine/Compiler.cpp
+++ b/lib/ExecutionEngine/Compiler.cpp
@@ -42,7 +42,6 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
 
-#include "llvm/Target/SubtargetFeature.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
@@ -54,6 +53,7 @@
 #include "llvm/MC/MCDisassembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstPrinter.h"
+#include "llvm/MC/SubtargetFeature.h"
 #include "llvm/Support/MemoryObject.h"
 #include "llvm/LLVMContext.h"
 #endif
@@ -368,7 +368,6 @@
 
   if (!CPU.empty() || !Features.empty()) {
     llvm::SubtargetFeatures F;
-    F.setCPU(CPU);
 
     for (std::vector<std::string>::const_iterator
          I = Features.begin(), E = Features.end(); I != E; I++) {
@@ -378,7 +377,7 @@
     FeaturesStr = F.getString();
   }
 
-  TM = Target->createTargetMachine(Triple, FeaturesStr);
+  TM = Target->createTargetMachine(Triple, CPU, FeaturesStr);
   if (TM == NULL) {
     setError("Failed to create target machine implementation for the"
              " specified triple '" + Triple + "'");