* 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
100 lines
3.0 KiB
Diff
100 lines
3.0 KiB
Diff
From 23574ea1b3502dd13efa9b3ebf32fee3118e6ff0 Mon Sep 17 00:00:00 2001
|
|
From: Tom de Vries <tdevries@suse.de>
|
|
Date: Mon, 20 Jan 2025 05:41:01 +0100
|
|
Subject: [PATCH 29/46] [gdb/testsuite] Fix gdb.cp/non-trivial-retval.exp on
|
|
arm-linux with gcc 13
|
|
|
|
On arm-linux, with target board unix/-mthumb, we get:
|
|
...
|
|
(gdb) PASS: gdb.cp/non-trivial-retval.exp: continue to breakpoint: Break here
|
|
p f1 (i1, i2)^M
|
|
$1 = {a = -136274256}^M
|
|
(gdb) FAIL: gdb.cp/non-trivial-retval.exp: gdb-command<p f1 (i1, i2)>
|
|
...
|
|
|
|
This is not a problem with the inferior call, which works fine:
|
|
...
|
|
(gdb) p f1 (23, 100)
|
|
$3 = {a = 123}
|
|
...
|
|
but instead it's a problem with the location information:
|
|
...
|
|
(gdb) p i1
|
|
$1 = -136274356
|
|
(gdb) p i2
|
|
$2 = 100
|
|
...
|
|
which tells us to find the value of i1 in (DW_OP_fbreg: -12).
|
|
|
|
The test-case passes if we drop -fvar-tracking, in which case the debug info
|
|
tells us to find the value of i1 in (DW_OP_fbreg: -20).
|
|
|
|
This is with gcc 13.3.0 on Ubuntu 24.04. With gcc 14.2.0 on Debian testing,
|
|
the code is the same, but -fvar-tracking does use the correct
|
|
'(DW_OP_fbreg: -20)'.
|
|
|
|
There seems to be some bugfix in -fvar-tracking for gcc 14.
|
|
|
|
Workaround the bug by using constants 23 and 100 instead of i1 and i2 when
|
|
using -fvar-tracking and gcc < 14.
|
|
|
|
Tested on arm-linux.
|
|
|
|
PR testsuite/32549
|
|
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32549
|
|
---
|
|
gdb/testsuite/gdb.cp/non-trivial-retval.exp | 28 ++++++++++++++++-----
|
|
1 file changed, 22 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/gdb/testsuite/gdb.cp/non-trivial-retval.exp b/gdb/testsuite/gdb.cp/non-trivial-retval.exp
|
|
index 6c9f7e13d2a..64c0867368d 100644
|
|
--- a/gdb/testsuite/gdb.cp/non-trivial-retval.exp
|
|
+++ b/gdb/testsuite/gdb.cp/non-trivial-retval.exp
|
|
@@ -21,8 +21,18 @@ require allow_cplus_tests
|
|
|
|
standard_testfile .cc
|
|
|
|
+set i1 i1
|
|
+set i2 i2
|
|
+
|
|
if {[have_fvar_tracking]} {
|
|
set additional_flags "additional_flags= -fvar-tracking"
|
|
+
|
|
+ if { [gcc_major_version] < 14 } {
|
|
+ # For armv7, target board unix/-mthumb, -fvar-tracking and gcc 13 we
|
|
+ # get incorrect location info. Work around this by using constants instead.
|
|
+ set i1 23
|
|
+ set i2 100
|
|
+ }
|
|
}
|
|
|
|
if {[prepare_for_testing "failed to prepare" $testfile $srcfile [list debug c++ $additional_flags]]} {
|
|
@@ -37,12 +47,18 @@ if {![runto_main]} {
|
|
gdb_breakpoint [gdb_get_line_number "Break here"]
|
|
gdb_continue_to_breakpoint "Break here"
|
|
|
|
-gdb_test "p f1 (i1, i2)" ".* = {a = 123}"
|
|
-gdb_test "p f2 (i1, i2)" ".* = {b = 123}"
|
|
-gdb_test "p f22 (i1, i2)" ".* = {b1 = 123}"
|
|
-gdb_test "p f3 (i1, i2)" ".* = {.* c = 123}"
|
|
-gdb_test "p f4 (i1, i2)" ".* = {.* e = 123}"
|
|
-gdb_test "p f5 (i1, i2)" ".* = {f = 123}"
|
|
+gdb_test "p f1 ($i1, $i2)" ".* = {a = 123}" \
|
|
+ "p f1 (i1, i2)"
|
|
+gdb_test "p f2 ($i1, $i2)" ".* = {b = 123}" \
|
|
+ "p f2 (i1, i2)"
|
|
+gdb_test "p f22 ($i1, $i2)" ".* = {b1 = 123}" \
|
|
+ "p f22 (i1, i2)"
|
|
+gdb_test "p f3 ($i1, $i2)" ".* = {.* c = 123}" \
|
|
+ "p f3 (i1, i2)"
|
|
+gdb_test "p f4 ($i1, $i2)" ".* = {.* e = 123}" \
|
|
+ "p f4 (i1, i2)"
|
|
+gdb_test "p f5 ($i1, $i2)" ".* = {f = 123}" \
|
|
+ "p f5 (i1, i2)"
|
|
|
|
gdb_breakpoint "f1"
|
|
gdb_breakpoint "f2"
|
|
--
|
|
2.43.0
|
|
|