From patchwork Wed May 15 17:13:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 90206 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 14AD8384AB68 for ; Wed, 15 May 2024 17:14:03 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 5F4A13858D20 for ; Wed, 15 May 2024 17:13:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5F4A13858D20 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5F4A13858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715793219; cv=none; b=LMgvfGMx6EFWW2YIxhWMNIqUxHMsAXty5ig3mo3ITBoigp9UIHVZY5qbT/vw/24ZAgERGERqWXgAvl0xLhBKmdJEygUIP5Ud3IgKToOrr8APbb5twqO3KpbEkDU/9F9kS1408TxRVKXaMS8DFYDXwRy8XcttWgAHvzgMWvLZq+c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715793219; c=relaxed/simple; bh=2GsCm2dh5pUrOzFn47Xxpqd1Z/d3fO1w7r320qHnGk0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=GYCtMx9XjwpmshNjeXQeRSnf6xctHCSNLTdnYBMvp2WiM30OCXcgr8/r0VqnVnnxX5+2ZASAydwyCmV1J0U+4vQ+lfqgEG7MYeFd56FI6yP0373uWQyqlCTM7uvLm6eYL9HF2MUdggdadEFWGfDKcUa5RhRG7FU8xz4e72YlDa4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 8FB3C1E030; Wed, 15 May 2024 13:13:33 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH] gdb: move lm_info to solib in dsbt_current_sos Date: Wed, 15 May 2024 13:13:27 -0400 Message-ID: <20240515171332.45675-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1173.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP 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.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Commit 8971d2788e79 ("gdb: link so_list using intrusive_list") mistakenly removed the line that moves the lm_info unique pointer to sop->lm_info, probably due to a bad conflict resolution. Restore that line. Unfortunately, this code is only used for TI C66, which is not widely tested (if used at all). Change-Id: I9f64eb4430c324bc93ddb4bd00d820dee34adfbb --- gdb/solib-dsbt.c | 1 + 1 file changed, 1 insertion(+) base-commit: 53071aac476c2d497b313b1ee09a462912cb1d87 diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c index 11225f72ed01..908c78aebdca 100644 --- a/gdb/solib-dsbt.c +++ b/gdb/solib-dsbt.c @@ -616,6 +616,7 @@ dsbt_current_sos (void) sop->so_original_name = sop->so_name; } + sop->lm_info = std::move (li); sos.push_back (*sop); } else