commit a344b6c314e32ff6f8e6475024b30aecf31e3f21
author Jim Grosbach <grosbach@apple.com> Mon Apr 14 22:23:30 2014 +0000
committer Jim Grosbach <grosbach@apple.com> Mon Apr 14 22:23:30 2014 +0000
tree c6b992347f361e977dd4fc0d890967e94fe1b04e
parent 9027abae53ece016503d3a9b11e2f0e2a3db2283

X86: Nuke one more CPU autodetect blurb.

Missed one in r206094. This brings MC and TargetMachine back into sync.

llvm-svn: 206220

llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp

diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
index 09fdb9c..8f14148 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
@@ -230,14 +230,8 @@
   }
 
   std::string CPUName = CPU;
-  if (CPUName.empty()) {
-#if defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86)\
-    || defined(__x86_64__) || defined(_M_AMD64) || defined (_M_X64)
-    CPUName = sys::getHostCPUName();
-#else
+  if (CPUName.empty())
     CPUName = "generic";
-#endif
-  }
 
   MCSubtargetInfo *X = new MCSubtargetInfo();
   InitX86MCSubtargetInfo(X, TT, CPUName, ArchFS);