diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3235f08a70..40ff8db975 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-18  Corinna Vinschen  <vinschen@redhat.com>
+
+	* gdb.base/ending-run.exp: Fix expected string for _wrap_main to
+	allow correct handling of #ifdef UNDERSCORES from dejagnu/testglue.c.
+	Add newline to expected string in "step out of main (status wrapper)"
+	case.
+
 2002-09-18  Corinna Vinschen  <vinschen@redhat.com>
 
 	* lib/gdb.exp (rerun_to_main): Allow restarting application.
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 69f2b26917..1b0f560783 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -195,7 +195,7 @@ gdb_expect {
 	    -re ".*in.*\\\$START\\\$.*from.*dld.sl.*$gdb_prompt $" { 
 		pass "step out of main"
 	    }
-	    -re ".*in __wrap_main ().*$gdb_prompt $" {
+	    -re ".*in __wrap__?main ().*$gdb_prompt $" {
 		pass "step out of main (status wrapper)"
 	    }
             -re ".*$gdb_prompt $" { fail "step out of main (at end 2)" }
@@ -245,7 +245,7 @@ if {! [target_info exists use_gdb_stub]
 		# exit" message.
 		pass "step to end of run"
 	    }
-	    -re "Single.*EXIT code 0.*Program exited normally.*$gdb_prompt $" {
+	    -re "Single.*EXIT code 0\r\n.*Program exited normally.*$gdb_prompt $" {
 		pass "step to end of run (status wrapper)"
 	    }
 	    -re ".*Single.*Program exited.*$gdb_prompt $" {