From 7628a997f27af115006c370d58f27d38330814fe Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 12 Oct 2023 19:42:19 +0100 Subject: [PATCH] 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 --- gdb/coffread.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gdb/coffread.c b/gdb/coffread.c index 4a6a83b15ad..e1415d6b258 100644 --- 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 -- 2.30.2