diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2012-01-30 23:10:32 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2012-01-30 23:10:32 +0000 |
| commit | 4e7992eebab2c6e93b42ec9152d486a72a285fa4 (patch) | |
| tree | 33c426cce774a658e2c669a5727c5012c0a7566c /llvm/lib/Target/X86 | |
| parent | fcbd65d27b153a9bdd07f31b4ea46e708148ae6a (diff) | |
| download | bcm5719-llvm-4e7992eebab2c6e93b42ec9152d486a72a285fa4.tar.gz bcm5719-llvm-4e7992eebab2c6e93b42ec9152d486a72a285fa4.zip | |
PR11834: Use macros which are defined on Windows. Patch by Marina Yatsina.
llvm-svn: 149294
Diffstat (limited to 'llvm/lib/Target/X86')
| -rw-r--r-- | llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86Subtarget.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp index 5a3fc589148..4db1e2f45f8 100644 --- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp +++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp @@ -331,7 +331,8 @@ MCSubtargetInfo *X86_MC::createX86MCSubtargetInfo(StringRef TT, StringRef CPU, 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"; diff --git a/llvm/lib/Target/X86/X86Subtarget.cpp b/llvm/lib/Target/X86/X86Subtarget.cpp index f4a6261973e..718497e3342 100644 --- a/llvm/lib/Target/X86/X86Subtarget.cpp +++ b/llvm/lib/Target/X86/X86Subtarget.cpp @@ -342,7 +342,8 @@ X86Subtarget::X86Subtarget(const std::string &TT, const std::string &CPU, if (!FS.empty() || !CPU.empty()) { 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"; |
