48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
|
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andrew Burgess <aburgess@redhat.com>
|
||
|
|
Date: Thu, 12 Oct 2023 19:42:19 +0100
|
||
|
|
Subject: gdb-sync-coffread-with-elfread.patch
|
||
|
|
|
||
|
|
;; Backport upstream commit 7628a997f27.
|
||
|
|
|
||
|
|
gdb/coffread: bring separate debug file logic into line with elfread.c
|
||
|
|
|
||
|
|
In this commit:
|
||
|
|
|
||
|
|
commit 8a92335bfca80cc9b4cd217505ea0dcbfdefbf07
|
||
|
|
Date: Fri Feb 1 19:39:04 2013 +0000
|
||
|
|
|
||
|
|
the logic for when we try to load a separate debug file in elfread.c
|
||
|
|
was extended. The new code checks that the objfile doesn't already
|
||
|
|
have a separate debug objfile linked to it, and that the objfile isn't
|
||
|
|
itself a separate debug objfile for some other objfile.
|
||
|
|
|
||
|
|
The coffread code wasn't extended at the same time.
|
||
|
|
|
||
|
|
I don't know if it's possible for the coffread code to get into the
|
||
|
|
same state where these checks are needed, but I don't see why having
|
||
|
|
these checks would be a problem. In a later commit I plan to merge
|
||
|
|
this part of the elfread and coffread code, so bringing these two
|
||
|
|
pieces of code into line first makes that job easier.
|
||
|
|
|
||
|
|
I've tested this with a simple test binary compiled with the mingw
|
||
|
|
toolchain on a Linux host. After compiling the binary and splitting
|
||
|
|
out the debug info GDB still finds and loads the separate debug info.
|
||
|
|
|
||
|
|
Approved-By: Tom Tromey <tom@tromey.com>
|
||
|
|
|
||
|
|
diff --git a/gdb/coffread.c b/gdb/coffread.c
|
||
|
|
--- a/gdb/coffread.c
|
||
|
|
+++ b/gdb/coffread.c
|
||
|
|
@@ -725,7 +725,9 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
|
||
|
|
}
|
||
|
|
|
||
|
|
/* Try to add separate debug file if no symbols table found. */
|
||
|
|
- if (!objfile->has_partial_symbols ())
|
||
|
|
+ else if (!objfile->has_partial_symbols ()
|
||
|
|
+ && objfile->separate_debug_objfile == NULL
|
||
|
|
+ && objfile->separate_debug_objfile_backlink == NULL)
|
||
|
|
{
|
||
|
|
deferred_warnings warnings;
|
||
|
|
std::string debugfile
|