Merge from mainline.

llvm-svn: 58460

llvm/test/FrontendC/2008-08-07-AlignPadding1.c

-/* RUN: %llvmgcc %s -m64 -S -o - -emit-llvm -O0 | grep {zeroinitializer.*zeroinitializer.*zeroinitializer.*zeroinitializer.*zeroinitializer.*zeroinitializer}
+/* RUN: %llvmgcc %s -S -o - -emit-llvm -O0 | grep {zeroinitializer.*zeroinitializer.*zeroinitializer.*zeroinitializer.*zeroinitializer.*zeroinitializer}
 
 The FE must generate padding here both at the end of each PyG_Head and
 between array elements.  Reduced from Python. */

llvm/test/FrontendC/2008-08-07-AlignPadding2.c

-/* RUN: %llvmgcc %s -m64 -S -o - -emit-llvm -O0 | grep zeroinitializer | count 1
+/* RUN: %llvmgcc %s -S -o - -emit-llvm -O0 | grep zeroinitializer | count 1
 
 The FE must not generate padding here between array elements.  PR 2533. */