From: Yao Qi Date: Wed, 2 Dec 2015 09:32:34 +0000 (+0000) Subject: Fix regression by Do not skip prologue for asm (.S) files X-Git-Tag: gdb-7.10.1-release~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87a8c81ef09b8f86844924c71b2d886b58991c60;p=thirdparty%2Fbinutils-gdb.git Fix regression by Do not skip prologue for asm (.S) files Patch "Do not skip prologue for asm (.S) files" [1] changes GDB's behaviour on which test gdb.arch/thumb-singlestep.exp depends, so it causes the fail below: (gdb) si^M 37 blx foo^M (gdb) FAIL: gdb.arch/thumb-singlestep.exp: step into foo the test assumes the program will stop at the instruction after "push" but it doesn't. The fix to this fail is to do one more single step. [1] https://sourceware.org/ml/gdb-patches/2015-06/msg00561.html gdb/testsuite: 2015-12-02 Yao Qi * gdb.arch/thumb-singlestep.exp: Do one more single step. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 12754fc795d..dd253e3b06c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-12-02 Yao Qi + + * gdb.arch/thumb-singlestep.exp: Do one more single step. + 2015-08-21 Gary Benson * gdb.trace/pending.exp: Cope with remote transfer warnings. diff --git a/gdb/testsuite/gdb.arch/thumb-singlestep.exp b/gdb/testsuite/gdb.arch/thumb-singlestep.exp index 07adaaf3b2d..e7a865f2636 100644 --- a/gdb/testsuite/gdb.arch/thumb-singlestep.exp +++ b/gdb/testsuite/gdb.arch/thumb-singlestep.exp @@ -34,5 +34,8 @@ if ![runto_main] then { return -1 } +# GDB doesn't skip prologue for asm files, so do one single step to +# pass instruction "push". +gdb_test "si" "blx foo.*" "single step" gdb_test "si" "foo \\(\\) at .*${srcfile}.*mov r0,#42.*" "step into foo"