f61a679e8e
* Fix 16.0 handling. - Patches added: * gdb-testsuite-fix-gdb.python-py-format-string.exp-wi.patch * gdb-testsuite-fix-gdb.python-py-mi-cmd.exp-with-pyth.patch * gdb-testsuite-fix-gdb.ada-mi_task_arg.exp-on-arm-lin.patch * gdb-testsuite-fix-regexp-in-gdb.ada-mi_var_access.ex.patch * gdb-testsuite-check-gnatmake-version-in-gdb.ada-scal.patch * gdb-testsuite-fix-gdb.arch-arm-pseudo-unwind.exp-wit.patch * gdb-symtab-fix-target-type-of-complex-long-double-on.patch * gdb-testsuite-don-t-use-set-auto-solib-add-off.patch * gdb-tdep-fix-arm-thumb2-hw-breakpoint.patch * gdb-testsuite-fix-gdb.cp-m-static.exp-on-arm.patch * gdb-testsuite-fix-gdb.dwarf2-dw2-fixed-point.exp-on-.patch * gdb-testsuite-fix-gdb.dwarf2-dw2-lines.exp-on-arm-li.patch * gdb-exp-fix-gdb.fortran-intrinsics.exp-fail-on-arm.patch * gdb-tdep-handle-sycall-statx-for-arm-linux.patch * gdb-tdep-fix-recording-of-t1-push.patch * gdb-tdep-handle-syscall-clock_gettime64-for-arm-linu.patch * fix-gdb.dwarf2-shortpiece.exp-on-s390x.patch * handle-address-class-annotation-for-s390x-in-some-te.patch * fix-gdb.dap-step-out.exp-on-s390x.patch * use-setvariable-in-gdb.dap-scopes.exp.patch * fix-gdb.base-finish-pretty.exp-on-s390x.patch * fix-gdb.base-readnever.exp-on-s390x.patch * add-dwarf_expr_piece.op.patch * add-gdbarch_dwarf2_reg_piece_offset-hook.patch * fix-gdb.base-store.exp-on-s390x.patch * fix-gdb.ada-o2_float_param.exp-on-s390x-linux.patch * gdb-testsuite-fix-gdb.base-branch-to-self.exp-on-arm.patch * gdb-tdep-fix-gdb.cp-non-trivial-retval.exp-on-riscv6.patch * gdb-testsuite-fix-gdb.cp-non-trivial-retval.exp-on-a.patch * gdb-testsuite-fix-gdb.rust-completion.exp-timeout-on.patch * gdb-testsuite-require-supports_process_record-in-gdb.patch * gdb-testsuite-fix-regexp-in-gdb.arch-i386-disp-step-.patch * gdb-testsuite-fix-gdb.arch-arm-single-step-kernel-he.patch * gdb-testsuite-fix-gdb.python-py-format-address.exp-o.patch * gdb-testsuite-fix-gdb.arch-riscv-tdesc-regs.exp.patch * gdb-testsuite-fix-gdb.base-list-dot-nodebug-and-make.patch * gdb-testsuite-fix-gdb.base-list-dot-nodebug.exp-on-o.patch * gdb-testsuite-fix-gdb.base-empty-host-env-vars.exp.patch * gdb-prune-inferior-after-switching-inferior.patch * gdb-testsuite-use-nostdlib-in-gdb.base-list-dot-node.patch * gdb-testsuite-fix-timeout-in-gdb.mi-mi-multi-command.patch * gdb-testsuite-require-can_spawn_for_attach-in-gdb.ba.patch * fixup-gdb-6.5-gcore-buffer-limit-test.patch * gdb-testsuite-fix-gdb.ada-big_packed_array.exp-on-s3.patch * gdb-testsuite-fix-gdb.ada-convvar_comp.exp-on-s390x-.patch * gdb-testsuite-fix-regexp-in-gdb.threads-stepi-over-c.patch OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=437
71 lines
2.7 KiB
Diff
71 lines
2.7 KiB
Diff
From 58e1c193329c4e919272f01e5626b912d36ff65d Mon Sep 17 00:00:00 2001
|
|
From: Tom de Vries <tdevries@suse.de>
|
|
Date: Tue, 23 Jul 2024 14:27:36 +0200
|
|
Subject: [PATCH 03/46] [gdb/testsuite] Fix gdb.ada/mi_task_arg.exp on
|
|
arm-linux
|
|
|
|
On arm-linux, I run into:
|
|
...
|
|
PASS: gdb.ada/mi_task_arg.exp: mi runto task_switch.break_me
|
|
Expecting: ^(-stack-list-arguments 1[^M
|
|
]+)?(\^done,stack-args=\[frame={level="0",args=\[\]},frame={level="1",args=\[{name="<_task>",value="0x[0-9A-Fa-f]+"}(,{name="<_taskL>",value="[0-9]+"})?\]},frame={level="2",args=\[({name="self_id",value="(0x[0-9A-Fa-f]+|<optimized out>)"})?\]},.*[^M
|
|
]+[(]gdb[)] ^M
|
|
[ ]*)
|
|
-stack-list-arguments 1^M
|
|
^done,stack-args=[frame={level="0",args=[]},frame={level="1",args=[{name="<_task>",value="0x40bc48"}]},frame={level="2",args=[]}]^M
|
|
(gdb) ^M
|
|
FAIL: gdb.ada/mi_task_arg.exp: -stack-list-arguments 1 (unexpected output)
|
|
...
|
|
|
|
The problem is that the test-case expects a level 3 frame, but there is none.
|
|
|
|
This can be reproduced using cli bt:
|
|
...
|
|
$ gdb -q -batch outputs/gdb.ada/mi_task_arg/task_switch \
|
|
-ex "b task_switch.break_me" \
|
|
-ex run \
|
|
-ex bt
|
|
Breakpoint 1 at 0x34b4: file task_switch.adb, line 57.
|
|
|
|
Thread 3 "my_caller" hit Breakpoint 1, task_switch.break_me () \
|
|
at task_switch.adb:57
|
|
57 null;
|
|
#0 task_switch.break_me () at task_switch.adb:57
|
|
#1 0x00403424 in task_switch.caller (<_task>=0x40bc48) at task_switch.adb:51
|
|
#2 0xf7f95a08 in ?? () from /lib/arm-linux-gnueabihf/libgnarl-12.so
|
|
Backtrace stopped: previous frame identical to this frame (corrupt stack?)
|
|
...
|
|
|
|
The purpose of the test-case is printing the frame at level 1, so I don't
|
|
think we should bother about the presence of the frame at level 3.
|
|
|
|
Fix this by allowing the backtrace to stop at level 2.
|
|
|
|
Tested on arm-linux.
|
|
|
|
Approved-By: Luis Machado <luis.machado@arm.com>
|
|
Approved-By: Andrew Burgess <aburgess@redhat.com>
|
|
---
|
|
gdb/testsuite/gdb.ada/mi_task_arg.exp | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/gdb/testsuite/gdb.ada/mi_task_arg.exp b/gdb/testsuite/gdb.ada/mi_task_arg.exp
|
|
index 098396d5c09..b4b7b4997f3 100644
|
|
--- a/gdb/testsuite/gdb.ada/mi_task_arg.exp
|
|
+++ b/gdb/testsuite/gdb.ada/mi_task_arg.exp
|
|
@@ -49,7 +49,8 @@ set frame1 "frame=\{level=\"1\",args=\\\[${frame1_args}(,$frame1_opt_args)?\\\]\
|
|
# Frame for system.tasking.stages.task_wrapper
|
|
set frame2_args "(\{name=\"self_id\",value=\"($hex|<optimized out>)\"\})?"
|
|
set frame2 "frame=\{level=\"2\",args=\\\[$frame2_args\\\]\}"
|
|
-mi_gdb_test "-stack-list-arguments 1" \
|
|
- "\\^done,stack-args=\\\[$frame0,$frame1,$frame2,.*" \
|
|
- "-stack-list-arguments 1"
|
|
|
|
+set frames "$frame0,$frame1,${frame2}(,.*)?"
|
|
+mi_gdb_test "-stack-list-arguments 1" \
|
|
+ "\\^done,stack-args=\\\[$frames\\\]" \
|
|
+ "-stack-list-arguments 1"
|
|
--
|
|
2.43.0
|
|
|