From 6dfef6605f788013099ea29e36e077015e2cfc23 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Fri, 8 Jul 2011 23:07:42 +0000 Subject: [PATCH] Revert earlier unnecessary hack. Make sure we correctly force on 64bit and cmov for 64-bit targets. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134768 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp | 2 +- lib/Target/X86/X86Subtarget.cpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp index 4bddce426b1..728246ffa2e 100644 --- a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp +++ b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp @@ -35,7 +35,7 @@ using namespace llvm; std::string X86_MC::ParseX86Triple(StringRef TT) { Triple TheTriple(TT); if (TheTriple.getArch() == Triple::x86_64) - return "+64bit-mode,+64bit,+sse2"; + return "+64bit-mode"; return "-64bit-mode"; } diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp index 3ae6e619377..5bd70e40226 100644 --- a/lib/Target/X86/X86Subtarget.cpp +++ b/lib/Target/X86/X86Subtarget.cpp @@ -269,9 +269,14 @@ X86Subtarget::X86Subtarget(const std::string &TT, const std::string &CPU, // Otherwise, use CPUID to auto-detect feature set. AutoDetectSubtargetFeatures(); - // Make sure SSE2 is enabled; it is available on all X86-64 CPUs. - if (In64BitMode && !HasAVX && X86SSELevel < SSE2) - X86SSELevel = SSE2; + // Make sure 64-bit features are available in 64-bit mode. + if (In64BitMode) { + HasX86_64 = true; + HasCMov = true; + + if (!HasAVX && X86SSELevel < SSE2) + X86SSELevel = SSE2; + } } DEBUG(dbgs() << "Subtarget features: SSELevel " << X86SSELevel -- 2.34.1