From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 9D597385C30F; Thu, 9 Jun 2022 08:58:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9D597385C30F Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id CE69C1F9B0; Thu, 9 Jun 2022 08:58:45 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C2A9F13456; Thu, 9 Jun 2022 08:58:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kAhrLkW2oWKJXAAAMHmgww (envelope-from ); Thu, 09 Jun 2022 08:58:45 +0000 Date: Thu, 9 Jun 2022 10:58:44 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Cc: binutils@sourceware.org Subject: [PATCH][gdb] Fix fbsd core matching Message-ID: <20220609085842.GA32249@delia.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2022 08:58:48 -0000 Hi, With an --enable-targets=all build and target board unix/-m32 I run into a FAIL in test-case gdb.base/corefile.exp: ... (gdb) file outputs/gdb.base/corefile/corefile^M Reading symbols from outputs/gdb.base/corefile/corefile...^M (gdb) core-file outputs/gdb.base/corefile/corefile.core^M warning: core file may not match specified executable file.^M [New LWP 12011]^M Core was generated by `outputs/gdb.base/corefile/co'.^M Program terminated with signal SIGABRT, Aborted.^M (gdb) FAIL: gdb.base/corefile.exp: core-file warning-free ... The warning is there because of this mismatch between core and exec: ... (gdb) p core_bfd->xvec $3 = (const struct bfd_target *) 0x20112a0 (gdb) p exec_bfd->xvec $4 = (const struct bfd_target *) 0x2010b00 ... In the exec case, the detected architecture is i386_elf32_vec because this bit of code in elfcode.h:elf_object_p(): ... if (ebd->elf_machine_code != EM_NONE && i_ehdrp->e_ident[EI_OSABI] != ebd->elf_osabi && ebd->elf_osabi != ELFOSABI_NONE) goto got_wrong_format_error; ... prevents i386_elf32_fbsd from matching. Fix the core matching by copying that code to elfcore.h:elf_core_file_p(). Tested on x86_64-linux. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29227 Any comments? Thanks, - Tom [gdb] Fix fbsd core matching --- bfd/elfcore.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bfd/elfcore.h b/bfd/elfcore.h index 809f6711aed..4ce81e2e383 100644 --- a/bfd/elfcore.h +++ b/bfd/elfcore.h @@ -272,6 +272,11 @@ elf_core_file_p (bfd *abfd) && ebd->elf_machine_code != EM_NONE) goto fail; + if (ebd->elf_machine_code != EM_NONE + && i_ehdrp->e_ident[EI_OSABI] != ebd->elf_osabi + && ebd->elf_osabi != ELFOSABI_NONE) + goto fail; + /* Let the backend double check the format and override global information. We do this before processing the program headers to allow the correct machine (as opposed to just the default