Introduce a new technique for merging BasicBlock with Instruction sentinel by superpo...

[oota-llvm.git] / lib / Target / X86 / X86Subtarget.cpp

diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp
index 5ceafa4c593d2fd3af02b22c3817d1c5f6e5c9fb..cd292a4a2c67d7f1a28f4a524732df46eb01ca89 100644 (file)
--- a/lib/Target/X86/X86Subtarget.cpp
+++ b/lib/Target/X86/X86Subtarget.cpp
@@ -327,15 +327,16 @@ X86Subtarget::X86Subtarget(const Module &M, const std::string &FS, bool is64Bit)
   } else {
     // Otherwise, use CPUID to auto-detect feature set.
     AutoDetectSubtargetFeatures();
-    // If requesting codegen for X86-64, make sure that 64-bit features
-    // are enabled.
-    if (Is64Bit)
-      HasX86_64 = true;
     // Make sure SSE2 is enabled; it is available on all X86-64 CPUs.
     if (Is64Bit && X86SSELevel < SSE2)
       X86SSELevel = SSE2;
   }
 
+  // If requesting codegen for X86-64, make sure that 64-bit features
+  // are enabled.
+  if (Is64Bit)
+    HasX86_64 = true;
+
   DOUT << "Subtarget features: SSELevel " << X86SSELevel
        << ", 3DNowLevel " << X863DNowLevel
        << ", 64bit " << HasX86_64 << "\n";