From f4f00b1fe517130cede4173861806bf43784e670 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Wed, 4 Dec 2002 03:07:45 +0000 Subject: [PATCH] * gdb.base/step-test.exp: Allow MIPS to return to the line of a function call. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/step-test.exp | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3b2e467e8a9..dd8fe247500 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2002-12-03 Daniel Jacobowitz + + * gdb.base/step-test.exp: Allow MIPS to return to the line of a + function call. + 2002-11-25 Jim Blandy * lib/mi-support.exp (mi_delete_breakpoints): Change name of diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp index 9a21136996c..32af949cf28 100644 --- a/gdb/testsuite/gdb.base/step-test.exp +++ b/gdb/testsuite/gdb.base/step-test.exp @@ -78,7 +78,8 @@ gdb_test "step" ".*${decimal}.*myglob.*" "step into" # On PA64, we end up at a different instruction than PA32. # On IA-64, we also end up on callee instead of on the next line due # to the restoration of the global pointer (which is a caller-save). -if { [istarget "hppa2.0w-hp-hpux*"] || [istarget "ia64-*-*"]} { +# Similarly on MIPS PIC targets. +if { [istarget "hppa2.0w-hp-hpux*"] || [istarget "ia64-*-*"] || [istarget "mips*-*-*"]} { send_gdb "finish\n" gdb_expect { -re ".*${decimal}.*a.*5.*= a.*3.*$gdb_prompt $" { pass "step out 1" } @@ -176,8 +177,11 @@ gdb_expect { # On PA64, we end up at a different instruction than PA32. # On IA-64, we end up on callee instead of on the following line due # to the restoration of the global pointer. - if { [istarget "hppa2.0w-hp-hpux*"] || [istarget "ia64-*-*"] } { + # Similarly on MIPS PIC targets. + if { [istarget "hppa2.0w-hp-hpux*"] || [istarget "ia64-*-*"] || [istarget "mips*-*-*"] } { pass "stepi: finish call 2" + test_i "stepi: past call" "stepi" \ + ".*${decimal}.*callee.*STEPI" ".*${decimal}.*callee.*NEXTI" } else { fail "stepi: finish call 2" return -- 2.30.2