From: Simon Marchi <simon.marchi@efficios.com>
Date: Mon, 22 Jul 2024 14:42:49 +0000 (-0400)
Subject: gdb/solib-frv: move lm_info object to solib
X-Git-Tag: gdb-16-branchpoint~1335
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a2f7d248a50a868152cb357dd05ebcd860ac244;p=thirdparty%2Fbinutils-gdb.git

gdb/solib-frv: move lm_info object to solib

I noticed that the lm_info_frv objects created in frv_current_sos are
never moved to the solib object.  This bug was introduced in 8971d2788e
("gdb: link so_list using intrusive_list"), which mistakenly removed the
line

    sop->lm_info = std::move (li);

... probably due so a bad merge conflict resolution.

Re-add this line.

If merged in master, I would cherry-pick this to gdb-15-branch.

Change-Id: I609a1a5ad39e93f70a95ea5ebe3f8ff4ab6a8db2
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32005
Approved-By: Andrew Burgess <aburgess@redhat.com>
---

diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index 79052db86f8..f84ff89ffe0 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -382,6 +382,8 @@ frv_current_sos ()
 	  li->map = loadmap;
 	  li->got_value = got_addr;
 	  li->lm_addr = lm_addr;
+	  sop->lm_info = std::move (li);
+
 	  /* Fetch the name.  */
 	  addr = extract_unsigned_integer (lm_buf.l_name,
 					   sizeof (lm_buf.l_name),