commit 6dfef6605f788013099ea29e36e077015e2cfc23
author Eli Friedman <eli.friedman@gmail.com> Fri Jul 08 23:07:42 2011 +0000
committer Eli Friedman <eli.friedman@gmail.com> Fri Jul 08 23:07:42 2011 +0000
tree cda06ee503eb4220d69fb20e4108417078be25f1
parent eb0caa115491019f7f7fe45fc70ad47682244187

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/X86Subtarget.cpp

diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp
index 3ae6e61..5bd70e4 100644
--- a/lib/Target/X86/X86Subtarget.cpp
+++ b/lib/Target/X86/X86Subtarget.cpp
@@ -269,9 +269,14 @@
     // 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