diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp
index a864bb69a95..ea185b98e82 100644
--- a/lib/Target/X86/X86Subtarget.cpp
+++ b/lib/Target/X86/X86Subtarget.cpp
@@ -255,6 +255,8 @@ X86Subtarget::X86Subtarget(const Module &M, const std::string &FS, bool is64Bit)
     }
   }
 
-  if (TargetType == isDarwin || TargetType == isCygwin)
+  if (TargetType == isDarwin ||
+      TargetType == isCygwin ||
+      (TargetType == isELF && Is64Bit))
     stackAlignment = 16;
 }