From e85baa92c8b6d68c254e33934397d4883fc12aef Mon Sep 17 00:00:00 2001
From: Richard Sandiford <rsandifo@linux.vnet.ibm.com>
Date: Wed, 21 Aug 2013 16:37:37 +0000
Subject: [PATCH] Tweak gnu-flags.c test for z, where globals have 2-byte
 alignment by default

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@188905 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/Sema/gnu-flags.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/Sema/gnu-flags.c b/test/Sema/gnu-flags.c
index ff5fdea5aa..2d4b518993 100644
--- a/test/Sema/gnu-flags.c
+++ b/test/Sema/gnu-flags.c
@@ -20,12 +20,18 @@
 #endif
 
 
+#ifdef __s390x__
+#define EXPECTED_ALIGN 2
+#else
+#define EXPECTED_ALIGN 1
+#endif
+
 #if ALL || ALIGNOF
 // expected-warning@+4 {{'_Alignof' applied to an expression is a GNU extension}}
 #endif
 
 char align;
-_Static_assert(_Alignof(align) == 1, "align's alignment is wrong");
+_Static_assert(_Alignof(align) == EXPECTED_ALIGN, "align's alignment is wrong");
 
 
 #if ALL || CASERANGE
-- 
2.40.0