From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1983) id 08029383940B; Wed, 18 May 2022 15:12:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08029383940B Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Carl Love To: gdb-cvs@sourceware.org Subject: [binutils-gdb] PowerPC: bp-permanent.exp, kill-after-signal fix X-Act-Checkin: binutils-gdb X-Git-Author: Carl Love X-Git-Refname: refs/heads/master X-Git-Oldrev: 1fe8486103e482bcd6cd74fdbf79a7d2ab9b111f X-Git-Newrev: 301fe55e9c44d03ebdfbd2b34c9b8570cc2f9f18 Message-Id: <20220518151219.08029383940B@sourceware.org> Date: Wed, 18 May 2022 15:12:19 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2022 15:12:19 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D301fe55e9c44= d03ebdfbd2b34c9b8570cc2f9f18 commit 301fe55e9c44d03ebdfbd2b34c9b8570cc2f9f18 Author: Carl Love Date: Fri May 6 21:49:22 2022 +0000 PowerPC: bp-permanent.exp, kill-after-signal fix =20 Fix changes that didn't make it into commit: dd9cd55e990bcc9f8448cac38d242d53974b3604. =20 Fix missing -wrap on gdb_test_multiple in gdb.base/kill-after-signal.exp that is causing regression test on x86_64-linux with taskset -c 0. Diff: --- gdb/testsuite/gdb.base/bp-permanent.exp | 15 +++++++++------ gdb/testsuite/gdb.base/kill-after-signal.exp | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/gdb/testsuite/gdb.base/bp-permanent.exp b/gdb/testsuite/gdb.ba= se/bp-permanent.exp index 21b0bc7bb2d..1ad9a698db8 100644 --- a/gdb/testsuite/gdb.base/bp-permanent.exp +++ b/gdb/testsuite/gdb.base/bp-permanent.exp @@ -260,28 +260,31 @@ proc test {always_inserted sw_watchpoint} { -re "Program received signal SIGTRAP.*$gdb_prompt $" { fail $test } - -re ".*signal handler called.*$gdb_prompt $" { - # PowerPC Linux kernel patchs: + -re "signal handler called.*$gdb_prompt $" { + # After PowerPC Linux kernel commit: + # # commit: 0138ba5783ae0dcc799ad401a1e8ac8333790df9 # powerpc/64/signal: Balance return predictor # stack in signal trampoline. # # The kernel places an additional brctl instruction - # in the vdso to call the user hadler. + # in the vdso to call the user handler. + # + # And then this commit: # # commit 24321ac668e452a4942598533d267805f291fdc9 # powerpc/64/signal: Fix regression in # __kernel_sigtramp_rt64() semantics # - # Updates the semantics of __kernel_sigtramp_rt64(). - # It adds a new symbol to serve as a jump target from + # updates the semantics of __kernel_sigtramp_rt64(). + # It added a new symbol to serve as a jump target from # the kernel to the trampoline. # # The net result of these changes is that gdb stops # at __kernel_start_sigtramp_rt64. Need to do one # more stepi to reach the expected location in the user # signal handler. - gdb_test "p \$pc" ".*__kernel_start_sigtramp_rt64.*" \ + gdb_test "p \$pc" "__kernel_start_sigtramp_rt64.*" \ "in kernel code" gdb_test "stepi" "handler .*" $test } diff --git a/gdb/testsuite/gdb.base/kill-after-signal.exp b/gdb/testsuite/g= db.base/kill-after-signal.exp index 7450b2ae4b9..bdb2a159bfa 100644 --- a/gdb/testsuite/gdb.base/kill-after-signal.exp +++ b/gdb/testsuite/gdb.base/kill-after-signal.exp @@ -39,24 +39,27 @@ gdb_test "continue" "Program received signal SIGUSR1, .= *" =20 set test "handler" gdb_test_multiple "stepi" $test { - -re "\r\nhandler .*" { + -re -wrap "\r\nhandler .*" { pass $test } - -re ".*signal handler called.*$gdb_prompt $" { - # PowerPC Linux kernel patchs: + -re "signal handler called.*$gdb_prompt $" { + # After PowerPC Linux kernel commit: + # # commit: 0138ba5783ae0dcc799ad401a1e8ac8333790df9 # powerpc/64/signal: Balance return predictor # stack in signal trampoline. # # The kernel places an additional brctl instruction - # in the vdso to call the user hadler. + # in the vdso to call the user handler. + # + # And then this commit: # # commit 24321ac668e452a4942598533d267805f291fdc9 # powerpc/64/signal: Fix regression in # __kernel_sigtramp_rt64() semantics # - # Updates the semantics of __kernel_sigtramp_rt64(). - # It adds a new symbol to serve as a jump target from + # updates the semantics of __kernel_sigtramp_rt64(). + # It added a new symbol to serve as a jump target from # the kernel to the trampoline. # # The net result of these changes is that gdb stops