From 55b006feb258c6dd7121dd26caf4cc80ba1ec3a6 Mon Sep 17 00:00:00 2001
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Fri, 10 Oct 2008 21:33:30 +0200
Subject: [PATCH] --- yaml --- r: 110830 b: refs/heads/master c:
 89d49841e9e7a90b04b036b7dbe7521b55edbe24 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/scripts/checkstack.pl | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fd260845e663..f61b1ad085ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a672cfa3a7fcbc6f2adc558f34148be1096c561
+refs/heads/master: 89d49841e9e7a90b04b036b7dbe7521b55edbe24
diff --git a/trunk/scripts/checkstack.pl b/trunk/scripts/checkstack.pl
index 3eca62566d6b..f7e8e93ff30d 100755
--- a/trunk/scripts/checkstack.pl
+++ b/trunk/scripts/checkstack.pl
@@ -81,7 +81,10 @@
 		$re = qr/.*st[dw]u.*r1,-($x{1,8})\(r1\)/o;
 	} elsif ($arch =~ /^s390x?$/) {
 		#   11160:       a7 fb ff 60             aghi   %r15,-160
-		$re = qr/.*ag?hi.*\%r15,-(([0-9]{2}|[3-9])[0-9]{2})/o;
+		# or
+		#  100092:	 e3 f0 ff c8 ff 71	 lay	 %r15,-56(%r15)
+		$re = qr/.*(?:lay|ag?hi).*\%r15,-(([0-9]{2}|[3-9])[0-9]{2})
+		      (?:\(\%r15\))?$/ox;
 	} elsif ($arch =~ /^sh64$/) {
 		#XXX: we only check for the immediate case presently,
 		#     though we will want to check for the movi/sub