6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-07 12:28:24 +00:00
Code Issues Projects Releases Wiki Activity

For non-x86 host, used generic as CPU name.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134741 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng
2011-07-08 21:14:14 +00:00
parent d28ec08edd
commit cc0ddc707d
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
View File

@@ -140,8 +140,13 @@ MCSubtargetInfo *X86_MC::createX86MCSubtargetInfo(StringRef TT, StringRef CPU,
} }
std::string CPUName = CPU; std::string CPUName = CPU;
if (CPUName.empty()) if (CPUName.empty()) {
#if defined (__x86_64__) || defined(__i386__)
CPUName = sys::getHostCPUName(); CPUName = sys::getHostCPUName();
#else
CPUName = "generic";
#endif
}
if (ArchFS.empty() && CPUName.empty() && hasX86_64()) if (ArchFS.empty() && CPUName.empty() && hasX86_64())
// Auto-detect if host is 64-bit capable, it's the default if true. // Auto-detect if host is 64-bit capable, it's the default if true.

15
lib/Target/X86/X86Subtarget.cpp
View File

@@ -258,12 +258,17 @@ X86Subtarget::X86Subtarget(const std::string &TT, const std::string &CPU,
ArchFS = FS; ArchFS = FS;
} }
std::string CPUName = CPU;
if (CPUName.empty())
CPUName = sys::getHostCPUName();
// Determine default and user specified characteristics // 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. // If feature string is not empty, parse features string.
ParseSubtargetFeatures(CPUName, ArchFS); ParseSubtargetFeatures(CPUName, ArchFS);
// All X86-64 CPUs also have SSE2, however user might request no SSE via // All X86-64 CPUs also have SSE2, however user might request no SSE via