diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2011-07-08 23:43:01 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2011-07-08 23:43:01 +0000 |
| commit | fe2088bb1f7c7ebb30d97a9888d8573211984dad (patch) | |
| tree | 041c4245e95f044ded87c2ac2fc45ef513d4926e /llvm/lib | |
| parent | 628d84005a1681a8a707b01d23a5fd7f260b62a5 (diff) | |
| download | bcm5719-llvm-fe2088bb1f7c7ebb30d97a9888d8573211984dad.tar.gz bcm5719-llvm-fe2088bb1f7c7ebb30d97a9888d8573211984dad.zip | |
Really force on 64bit for 64-bit targets. Should fix remaining failures on unknown x86/non-x86 targets.
llvm-svn: 134773
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Target/X86/X86Subtarget.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/llvm/lib/Target/X86/X86Subtarget.cpp b/llvm/lib/Target/X86/X86Subtarget.cpp index 5bd70e40226..e780615da39 100644 --- a/llvm/lib/Target/X86/X86Subtarget.cpp +++ b/llvm/lib/Target/X86/X86Subtarget.cpp @@ -258,11 +258,19 @@ X86Subtarget::X86Subtarget(const std::string &TT, const std::string &CPU, #endif } + // Make sure 64-bit features are available in 64-bit mode. (But make sure + // SSE2 can be turned off explicitly.) + std::string FullFS = FS; + if (In64BitMode) { + if (!FullFS.empty()) + FullFS = "+64bit,+sse2," + FullFS; + else + FullFS = "+64bit,+sse2"; + } + // If feature string is not empty, parse features string. - ParseSubtargetFeatures(CPUName, FS); + ParseSubtargetFeatures(CPUName, FullFS); - // All X86-64 CPUs also have SSE2, however user might request no SSE via - // -mattr, so don't force SSELevel here. if (HasAVX) X86SSELevel = NoMMXSSE; } else { |
