Index: include/clang/Basic/TargetInfo.h
===================================================================
--- include/clang/Basic/TargetInfo.h
+++ include/clang/Basic/TargetInfo.h
@@ -72,7 +72,7 @@
   unsigned char LargeArrayMinWidth, LargeArrayAlign;
   unsigned char LongWidth, LongAlign;
   unsigned char LongLongWidth, LongLongAlign;
-  unsigned char SuitableAlign;
+  unsigned short SuitableAlign;
   unsigned char DefaultAlignForAttributeAligned;
   unsigned char MinGlobalAlign;
   unsigned char MaxAtomicPromoteWidth, MaxAtomicInlineWidth;
Index: lib/Basic/Targets/X86.cpp
===================================================================
--- lib/Basic/Targets/X86.cpp
+++ lib/Basic/Targets/X86.cpp
@@ -748,6 +748,13 @@
     return false;
   }
 
+  if (hasFeature("avx512f"))
+      SuitableAlign = std::max(SuitableAlign, (unsigned short)512);
+  else if (hasFeature("avx"))
+      SuitableAlign = std::max(SuitableAlign, (unsigned short)256);
+  else if (hasFeature("sse"))
+      SuitableAlign = std::max(SuitableAlign, (unsigned short)128);
+
   SimdDefaultAlign =
       hasFeature("avx512f") ? 512 : hasFeature("avx") ? 256 : 128;
   return true;
Index: test/CodeGen/builtins-alloca.c
===================================================================
--- /dev/null
+++ test/CodeGen/builtins-alloca.c
@@ -0,0 +1,27 @@
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o - %s | \
+// RUN:   FileCheck %s -check-prefix=CHECK_X86_64
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o - %s -target-feature +avx | \
+// RUN:   FileCheck %s -check-prefix=CHECK_X86_64_AVX
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o - %s -target-feature +avx512f | \
+// RUN:   FileCheck %s -check-prefix=CHECK_X86_64_AVX512
+// RUN: %clang_cc1 -triple i386-unknown-linux-android -emit-llvm -o - %s | \
+// RUN:   FileCheck %s -check-prefix=CHECK_ANDROID_X86_32
+// RUN: %clang_cc1 -triple i386-unknown-linux-android -emit-llvm -o - %s -target-feature +sse | \
+// RUN:   FileCheck %s -check-prefix=CHECK_ANDROID_X86_32_SSE
+// RUN: %clang_cc1 -triple i386-unknown-linux-android -emit-llvm -o - %s -target-feature +avx | \
+// RUN:   FileCheck %s -check-prefix=CHECK_ANDROID_X86_32_AVX
+// RUN: %clang_cc1 -triple i386-unknown-linux-android -emit-llvm -o - %s -target-feature +avx512f | \
+// RUN:   FileCheck %s -check-prefix=CHECK_ANDROID_X86_32_AVX512
+
+
+char *c1; 
+// CHECK_X86_64: %1 = alloca i8, i64 1, align 16
+// CHECK_X86_64_AVX: %1 = alloca i8, i64 1, align 32
+// CHECK_X86_64_AVX512: %1 = alloca i8, i64 1, align 64
+// CHECK_ANDROID_X86_32: %1 = alloca i8, align 4
+// CHECK_ANDROID_X86_32_SSE: %1 = alloca i8, align 16
+// CHECK_ANDROID_X86_32_AVX: %1 = alloca i8, align 32
+// CHECK_ANDROID_X86_32_AVX512: %1 = alloca i8, align 64
+void f1() {
+    c1 = __builtin_alloca(1);
+}