diff options
author | Evan Cheng <evan.cheng@apple.com> | 2011-07-08 21:14:14 +0000 |
---|---|---|
committer | Evan Cheng <evan.cheng@apple.com> | 2011-07-08 21:14:14 +0000 |
commit | 964cb5feb0885460c50ac4c0962d108cb193ba1e (patch) | |
tree | 9ed37fc818687956c2e786f8ed702a989983b902 /llvm/lib/Target/X86/X86Subtarget.cpp | |
parent | d61ae786bd54c3bdd70b2e4ad75629c342d64543 (diff) | |
download | bcm5719-llvm-964cb5feb0885460c50ac4c0962d108cb193ba1e.tar.gz bcm5719-llvm-964cb5feb0885460c50ac4c0962d108cb193ba1e.zip |
For non-x86 host, used generic as CPU name.
llvm-svn: 134741
Diffstat (limited to 'llvm/lib/Target/X86/X86Subtarget.cpp')
-rw-r--r-- | llvm/lib/Target/X86/X86Subtarget.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/llvm/lib/Target/X86/X86Subtarget.cpp b/llvm/lib/Target/X86/X86Subtarget.cpp index b567c456b8f..fea4782c57e 100644 --- a/llvm/lib/Target/X86/X86Subtarget.cpp +++ b/llvm/lib/Target/X86/X86Subtarget.cpp @@ -258,12 +258,17 @@ X86Subtarget::X86Subtarget(const std::string &TT, const std::string &CPU, ArchFS = FS; } - std::string CPUName = CPU; - if (CPUName.empty()) - CPUName = sys::getHostCPUName(); - // Determine default and user specified characteristics - if (!CPUName.empty() || !ArchFS.empty()) { + if (!ArchFS.empty()) { + std::string CPUName = CPU; + if (CPUName.empty()) { +#if defined (__x86_64__) || defined(__i386__) + CPUName = sys::getHostCPUName(); +#else + CPUName = "generic"; +#endif + } + // If feature string is not empty, parse features string. ParseSubtargetFeatures(CPUName, ArchFS); // All X86-64 CPUs also have SSE2, however user might request no SSE via |