From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D1FEF3858032 for ; Wed, 8 Nov 2023 15:49:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D1FEF3858032 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D1FEF3858032 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699458549; cv=none; b=imb3dYvs/F5VBDmoF19CkEb5kwDgQwBtzdOrlxtZhfOLlSXSweGgCEcvAHCLkmBpSsyIYF56fFI7ZiidOa/I2NYFM3mCKLlPjrneMIxWZATiqbDsgSD3EqBvE87JJkcbW8gW/6uTjoUsbHiUPLIzRmZHiIJ8bVSkB0/84Q/A/sI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699458549; c=relaxed/simple; bh=S1rojNcaDYdasMVf73UtE/cjhXRnswW4EcuK1qH5wKY=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=HR/fz1rCWuuNnxmZOe+yN2I93qGcy5pIUEqXzr1Qq4LU620R7hHX67HIjWl0ZA8i007uIfa/C/DvHbtLEuyo4sHUQnc1PYjdwSrsHOiAhmDYLNEbrGI1ENDaEEbXrUFfkmeBsJ1maaqfmkzkY1BrZ20kEZKIxl1h1J0VdEiQEE0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699458548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G0vQwK2WrqvqqiEH02X5OCVURTlrn18hYZBVHLjHajI=; b=ele18ndbvUwrXlPZd0e4BnY7qx75RmXLyvU97mEEgQmtPJ0QbpmG+RSQxbJWHHXdBQYbWZ Mo103jwXjtSDhd2X2wzMAq33Ufo7gikFckE2Hm8J7dUbBoUQJNg3vxbA24Ezcuj26jSI3v gPkPFvHveSYRmjHsnu7Y47XUbPB1Xzo= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-220-rbKPHtgjNKqqv631JzyfEQ-1; Wed, 08 Nov 2023 10:49:07 -0500 X-MC-Unique: rbKPHtgjNKqqv631JzyfEQ-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40853e14f16so44833325e9.1 for ; Wed, 08 Nov 2023 07:49:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699458546; x=1700063346; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G0vQwK2WrqvqqiEH02X5OCVURTlrn18hYZBVHLjHajI=; b=owjl8A/p/o1pDwkeSoR9tHhhJSeydcTET/dlGilbl1nmScoZv2A68sb1sgctY0Rjw1 Owajan0k+YwCXHJWYYOwNekHZESuBGJZezBQ8G5AzoXTutsgCEFY+1DMRtZeJNylKEHF jPFaPl+nl4V7ZQLe163pKHxjfSZLWA/lEogwlbQWo6aELmTW0hT1ffAk2yXCxeH6xpa2 hAzVN9a9uM4WItAsO0jtSme3S521TKW3x9qhzhsO/0rZupHdMn8YDbn13LDDr4TzKbBM L7c7sm0R8qxPIdsC8fhsT8visdk/b+2JZ5hWyX8TZulBbhwUKl/gB5pA3CEBfqn9Cy4f xrQQ== X-Gm-Message-State: AOJu0Yw0QRPqNID1aFb5ZKKh5BjDJzZmc/s7mVI6G9aItklawq5VFWvi XEtMQOEoHIWvjqCEuGjemum8k8OohxRldKtoh62nsUFEvz7ZV+XUvu5m1jXwr/Rm8anT3UPnc1c OSTkAteJYIKDtjTGAAJU0/beY3dimdFledM08zb3HB39dM7Ve/BP6JpscQeLU9sda2Uq62PgFxt HLnTV1jw== X-Received: by 2002:a05:600c:35cc:b0:406:872d:7725 with SMTP id r12-20020a05600c35cc00b00406872d7725mr2103846wmq.1.1699458545849; Wed, 08 Nov 2023 07:49:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFCRVm4cC1G7mS+5gY3dmIU2KUa0t/DiOc4tiK2BNOrO5DlAn7FNSq4smdUAnPxAqqvnGP1cg== X-Received: by 2002:a05:600c:35cc:b0:406:872d:7725 with SMTP id r12-20020a05600c35cc00b00406872d7725mr2103827wmq.1.1699458545460; Wed, 08 Nov 2023 07:49:05 -0800 (PST) Received: from localhost (105.226.159.143.dyn.plus.net. [143.159.226.105]) by smtp.gmail.com with ESMTPSA id 17-20020a05600c021100b004053e9276easm19149300wmi.32.2023.11.08.07.49.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 07:49:05 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess , Tom Tromey Subject: [PATCHv2 1/5] gdb/coffread: bring separate debug file logic into line with elfread.c Date: Wed, 8 Nov 2023 15:48:55 +0000 Message-Id: <37450bea1413a898988ca47e58ec78f8f662fe88.1699458402.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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 List-Id: 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. --- 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.25.4