From 52470da3137612c5eeb5c08a6c1e944e3f89491a Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Sun, 18 Jan 2004 16:35:11 +0000
Subject: [PATCH] * gdb.base/gdb1476.exp: Accept alternat pattern for failed
 memory read at address 0.  This fixes PR testsuite/1504.

---
 gdb/testsuite/ChangeLog            | 5 +++++
 gdb/testsuite/gdb.base/gdb1476.exp | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 971b3d3ca5..d5fb5af145 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-18  Mark Kettenis  <kettenis@gnu.org>
+
+	* gdb.base/gdb1476.exp: Accept alternat pattern for failed memory
+	read at address 0.  This fixes PR testsuite/1504.
+
 2004-01-18  Daniel Jacobowitz  <drow@mvista.com>
 
 	* config/gdbserver.exp (gdbserver_gdb_load): Rename from gdb_load.
diff --git a/gdb/testsuite/gdb.base/gdb1476.exp b/gdb/testsuite/gdb.base/gdb1476.exp
index 2ac8074547..b88b2de065 100644
--- a/gdb/testsuite/gdb.base/gdb1476.exp
+++ b/gdb/testsuite/gdb.base/gdb1476.exp
@@ -56,6 +56,7 @@ if ![runto_main] then {
 
 send_gdb "x 0\n"
 gdb_expect {
+    -re "0x0:.*Cannot access memory at address 0x0.*$gdb_prompt $" { }
     -re "0x0:.*Error accessing memory address 0x0.*$gdb_prompt $" { }
     -re ".*$gdb_prompt $" {
 	untested "Memory at address 0 is possibly executable"
@@ -68,4 +69,4 @@ gdb_test "continue" "Program received signal SIGSEGV.*" \
 
 gdb_test "backtrace 10" \
 	"#0\[ \t\]*0x0* in .*\r\n#1\[ \t\]*$hex in x.*\r\n#2\[ \t\]*$hex in main.*" \
-	"backtrace from null pointer call"
\ No newline at end of file
+	"backtrace from null pointer call"