commit 4e7992eebab2c6e93b42ec9152d486a72a285fa4
author Evan Cheng <evan.cheng@apple.com> Mon Jan 30 23:10:32 2012 +0000
committer Evan Cheng <evan.cheng@apple.com> Mon Jan 30 23:10:32 2012 +0000
tree 33c426cce774a658e2c669a5727c5012c0a7566c
parent fcbd65d27b153a9bdd07f31b4ea46e708148ae6a

PR11834: Use macros which are defined on Windows. Patch by Marina Yatsina.

llvm-svn: 149294

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 5a3fc58..4db1e2f 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
@@ -331,7 +331,8 @@
 
   std::string CPUName = CPU;
   if (CPUName.empty()) {
-#if defined (__x86_64__) || defined(__i386__)
+#if defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86)\
+    || defined(__x86_64__) || defined(_M_AMD64) || defined (_M_X64)
     CPUName = sys::getHostCPUName();
 #else
     CPUName = "generic";