From df92229d39361fedc53192dbd75da35955024d3a Mon Sep 17 00:00:00 2001 From: Michael Munday Date: Thu, 28 Mar 2019 08:05:43 -0400 Subject: runtime: fix GDB tests on s390x running Ubuntu 18.04 On Ubuntu 18.04 I am seeing GDB fail to restore the stack pointer during this test because stack unwinding can't find the PC. This CL is essentially a partial revert of CL 23940 and fixes the issue on s390x. Fixes #33757 Change-Id: Ib4c41162dc85dc882eb6e248330f4082c3fa94c3 Reviewed-on: https://go-review.googlesource.com/c/go/+/169857 Run-TryBot: Cherry Zhang TryBot-Result: Gobot Gobot Reviewed-by: Cherry Zhang (cherry picked from commit d91f7e6637cc96029cd5a360a0a74153b39a3ae6) Reviewed-on: https://go-review.googlesource.com/c/go/+/200039 Run-TryBot: Katie Hockman Reviewed-by: Bryan C. Mills Reviewed-by: Michael Munday --- src/runtime/runtime-gdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/runtime-gdb.py b/src/runtime/runtime-gdb.py index 48960b7f61..72645d289e 100644 --- a/src/runtime/runtime-gdb.py +++ b/src/runtime/runtime-gdb.py @@ -540,8 +540,8 @@ class GoroutineCmd(gdb.Command): # In GDB, assignments to sp must be done from the # top-most frame, so select frame 0 first. gdb.execute('select-frame 0') - gdb.parse_and_eval('$sp = $save_sp') gdb.parse_and_eval('$pc = $save_pc') + gdb.parse_and_eval('$sp = $save_sp') save_frame.select() -- cgit v1.2.3-54-g00ecf