From b40f514fed16e4b9d155328938ca1a28f73f527b Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@redhat.com>
Date: Thu, 2 Aug 2012 20:37:14 +0000
Subject: [PATCH] 2012-08-02 Sergio Durigan Junior <sergiodj@redhat.com>
* gdb.base/pc-fp.exp: Adjust testcase to match different outputs from
s390x, PowerPC 64 and m68k-linux.
---
gdb/testsuite/ChangeLog | 5 +++++
gdb/testsuite/gdb.base/pc-fp.exp | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e587e28931a..f85848bee86 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-02 Sergio Durigan Junior <sergiodj@redhat.com>
+
+ * gdb.base/pc-fp.exp: Adjust testcase to match different outputs from
+ s390x, PowerPC 64 and m68k-linux.
+
2012-08-02 Ulrich Weigand <uweigand@de.ibm.com>
* gdb.base/annota1.exp: Accept no frames-invalid notification
diff --git a/gdb/testsuite/gdb.base/pc-fp.exp b/gdb/testsuite/gdb.base/pc-fp.exp
index 5ef6e4e91f0..beb5087fcfe 100644
--- a/gdb/testsuite/gdb.base/pc-fp.exp
+++ b/gdb/testsuite/gdb.base/pc-fp.exp
@@ -66,4 +66,4 @@ gdb_test "info register \$fp" "${valueof_fp}.*"
# Regression test for
# http://sourceware.org/bugzilla/show_bug.cgi?id=12659
gdb_test "info register pc fp" \
- "pc: ${valueof_pc}\[\r\n\]+fp: ${valueof_fp}\[\r\n\]+"
+ "pc(:)?( |\t)+${valueof_pc}(( |\t)+${valueof_pc} <.*>)?\[\r\n\]+fp(:)?( |\t)+${valueof_fp}(( |\t)+${valueof_fp})?\[\r\n\]+"