diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ead5e80c16..8eaedd4063 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-22  Michael Chastain  <chastain@redhat.com>
+
+	* mips_pro.exp: Accept either "middle -> top -> main" or
+	"middle -> main" in the backtrace, because gcc can optimize
+	tail calls to jumps.  Remove setup_xfail for the hppa case.
+	Add a comment with the original warning messages from PR 3016,
+	which was filed in 1993, to preserve them for posterity.
+
 2000-11-17  Nick Duffek  <nsd@redhat.com>
 
 	* lib/gdb.exp (gdb_test): Override timeout with board info.
diff --git a/gdb/testsuite/gdb.base/mips_pro.exp b/gdb/testsuite/gdb.base/mips_pro.exp
index ea2461e5f0..fca2cb9fef 100644
--- a/gdb/testsuite/gdb.base/mips_pro.exp
+++ b/gdb/testsuite/gdb.base/mips_pro.exp
@@ -54,9 +54,14 @@ gdb_load ${binfile}
 
 if [runto middle] then {
     # PR 3016
+    #   warning: Hit heuristic-fence-post without finding
+    #   warning: enclosing function for pc 0x1006ead0
     if {$gcc_compiled} then { 
-	setup_xfail "hppa*-*-*" "mips*-sgi-irix4*" "mips64*-*-elf"
+	setup_xfail "mips*-sgi-irix4*" "mips64*-*-elf"
     }
-    gdb_test "backtrace" "#0.*middle.*#1.*top.*#2.*main.*"
+    # The call chain is main -> top -> middle.  But gcc can optimize a tail
+    # call to a jump, so the stack may contain either main -> top -> middle
+    # or main -> middle.
+    gdb_test "backtrace" "#0.*middle.*#\[12\].*main.*"
 }
 return 0