From: Simon Marchi Date: Wed, 15 May 2024 17:13:27 +0000 (-0400) Subject: gdb: move lm_info to solib in dsbt_current_sos X-Git-Tag: gdb-15-branchpoint~76 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f155672d3457b5a014a99a6bd61b2b8be1d1c16;p=thirdparty%2Fbinutils-gdb.git gdb: move lm_info to solib in dsbt_current_sos 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 Approved-By: Tom Tromey --- diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c index 11225f72ed0..908c78aebdc 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