* [committed][gdb/testsuite] Fix gdb.dwarf2/fission-relative-dwo.exp with cc-with-gdb-index
@ 2021-08-02 13:32 Tom de Vries
0 siblings, 0 replies; only message in thread
From: Tom de Vries @ 2021-08-02 13:32 UTC (permalink / raw)
To: gdb-patches
Hi,
When running with target board cc-with-gdb-index, we run into:
...
gdb compile failed, warning: Could not find DWO CU \
fission-relative-dwo.dwo(0x1234) referenced by CU at offset 0xc7 \
[in module outputs/gdb.dwarf2/fission-relative-dwo/.tmp/fission-relative-dwo]
UNTESTED: gdb.dwarf2/fission-relative-dwo.exp: fission-relative-dwo.exp
ERROR: failed to compile fission-relative-dwo
...
The problem is that:
- the .dwo file is found relative to the executable, and
- cc-with-tweaks.sh moves the executable to a temp dir, but not
the .dwo file.
Fix this by copying the .dwo file alongside the executable in the temp dir.
Verified changes using shellcheck.
Tested on x86_64-linux.
Committed to trunk.
Thanks,
- Tom
[gdb/testsuite] Fix gdb.dwarf2/fission-relative-dwo.exp with cc-with-gdb-index
gdb/ChangeLog:
2021-08-02 Tom de Vries <tdevries@suse.de>
* contrib/cc-with-tweaks.sh: Copy .dwo files alongside executable.
---
gdb/contrib/cc-with-tweaks.sh | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gdb/contrib/cc-with-tweaks.sh b/gdb/contrib/cc-with-tweaks.sh
index 8653dfb260e..0d244dbdcb7 100755
--- a/gdb/contrib/cc-with-tweaks.sh
+++ b/gdb/contrib/cc-with-tweaks.sh
@@ -179,6 +179,19 @@ fi
if [ "$want_index" = true ]; then
get_tmpdir
mv "$output_file" "$tmpdir"
+ output_dir=$(dirname "$output_file")
+
+ # Copy .dwo file alongside, to fix gdb.dwarf2/fission-relative-dwo.exp.
+ # Use copy instead of move to not break
+ # rtf=gdb.dwarf2/fission-absolute-dwo.exp.
+ dwo_pattern="$output_dir/*.dwo"
+ for f in $dwo_pattern; do
+ if [ "$f" = "$dwo_pattern" ]; then
+ break
+ fi
+ cp "$f" "$tmpdir"
+ done
+
tmpfile="$tmpdir/$(basename $output_file)"
# Filter out these messages which would stop dejagnu testcase run:
# echo "$myname: No index was created for $file" 1>&2
@@ -187,6 +200,7 @@ if [ "$want_index" = true ]; then
| grep -v "^${GDB_ADD_INDEX##*/}: " >&2
rc=${PIPESTATUS[0]}
mv "$tmpfile" "$output_file"
+ rm -f "$tmpdir"/*.dwo
[ $rc != 0 ] && exit $rc
fi
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-02 13:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-02 13:32 [committed][gdb/testsuite] Fix gdb.dwarf2/fission-relative-dwo.exp with cc-with-gdb-index Tom de Vries
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).