From: Jim Grosbach <grosbach@apple.com>
Date: Mon, 14 Apr 2014 22:23:30 +0000 (+0000)
Subject: X86: Nuke one more CPU autodetect blurb.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fdf3f439ebd999c6f7084fde89ccad503ea7b3f9;p=oota-llvm.git

X86: Nuke one more CPU autodetect blurb.

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206220 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
index 09fdb9c14e8..8f141489923 100644
--- a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
+++ b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
@@ -230,14 +230,8 @@ MCSubtargetInfo *X86_MC::createX86MCSubtargetInfo(StringRef TT, StringRef CPU,
   }
 
   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);