Index: lib/Basic/Targets.cpp
===================================================================
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -3561,7 +3561,7 @@
     LongDoubleWidth = 128;
     LongDoubleAlign = 128;
     SuitableAlign = 128;
-    MaxVectorAlign = 256;
+    MaxVectorAlign = 512;
     SizeType = UnsignedLong;
     IntPtrType = SignedLong;
     DescriptionString = "e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128";
@@ -3893,7 +3893,7 @@
   DarwinX86_64TargetInfo(const llvm::Triple &Triple)
       : DarwinTargetInfo<X86_64TargetInfo>(Triple) {
     Int64Type = SignedLongLong;
-    MaxVectorAlign = 256;
+    MaxVectorAlign = 512;
     // The 64-bit iOS simulator uses the builtin bool type for Objective-C.
     llvm::Triple T = llvm::Triple(Triple);
     if (T.isiOS())
Index: test/CodeGen/vector-alignment.c
===================================================================
--- test/CodeGen/vector-alignment.c
+++ test/CodeGen/vector-alignment.c
@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -w -triple x86_64-apple-darwin10 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -w -triple i386-apple-darwin10 -emit-llvm -o - %s | FileCheck %s
 // rdar://11759609
 
 // At or below target max alignment with no aligned attribute should align based
@@ -7,32 +8,32 @@
 // CHECK: @v1 {{.*}}, align 16
 double __attribute__((vector_size(32))) v2;
 // CHECK: @v2 {{.*}}, align 32
+double __attribute__((vector_size(64))) v3;
+// CHECK: @v3 {{.*}}, align 64
 
 // Alignment above target max alignment with no aligned attribute should align
 // based on the target max.
-double __attribute__((vector_size(64))) v3;
-// CHECK: @v3 {{.*}}, align 32
 double __attribute__((vector_size(1024))) v4;
-// CHECK: @v4 {{.*}}, align 32
+// CHECK: @v4 {{.*}}, align 64
 
 // Aliged attribute should always override.
 double __attribute__((vector_size(16), aligned(16))) v5;
 // CHECK: @v5 {{.*}}, align 16
-double __attribute__((vector_size(16), aligned(64))) v6;
-// CHECK: @v6 {{.*}}, align 64
+double __attribute__((vector_size(16), aligned(128))) v6;
+// CHECK: @v6 {{.*}}, align 128
 double __attribute__((vector_size(32), aligned(16))) v7;
 // CHECK: @v7 {{.*}}, align 16
-double __attribute__((vector_size(32), aligned(64))) v8;
-// CHECK: @v8 {{.*}}, align 64
+double __attribute__((vector_size(32), aligned(128))) v8;
+// CHECK: @v8 {{.*}}, align 128
 
 // Check non-power of 2 widths.
 double __attribute__((vector_size(24))) v9;
 // CHECK: @v9 {{.*}}, align 32
 double __attribute__((vector_size(40))) v10;
-// CHECK: @v10 {{.*}}, align 32
+// CHECK: @v10 {{.*}}, align 64
 
 // Check non-power of 2 widths with aligned attribute.
-double __attribute__((vector_size(24), aligned(64))) v11;
-// CHECK: @v11 {{.*}}, align 64
+double __attribute__((vector_size(24), aligned(128))) v11;
+// CHECK: @v11 {{.*}}, align 128
 double __attribute__((vector_size(80), aligned(16))) v12;
 // CHECK: @v12 {{.*}}, align 16