From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 9C9FE3858292; Tue, 5 Jul 2022 12:40:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9C9FE3858292 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] elf: Fix direction of NODELETE log messages during symbol lookup X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 7519dee356a0ab21c8990e59ed05dd48a4e573a0 X-Git-Newrev: a9f9ee2381944cee8b4b50c5c8321e3529c77e49 Message-Id: <20220705124046.9C9FE3858292@sourceware.org> Date: Tue, 5 Jul 2022 12:40:46 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2022 12:40:46 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a9f9ee2381944cee8b4b50c5c8321e3529c77e49 commit a9f9ee2381944cee8b4b50c5c8321e3529c77e49 Author: Florian Weimer Date: Tue Jul 5 14:40:38 2022 +0200 elf: Fix direction of NODELETE log messages during symbol lookup NODELETE status is propagated from the referencing object to the referenced object, not the other way round. The code is correct, only the log message has the wrong direction. Reviewed-by: Adhemerval Zanella Diff: --- elf/dl-lookup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 8cb32321da..4c86dc694e 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -646,11 +646,11 @@ add_dependency (struct link_map *undef_map, struct link_map *map, int flags) { if (undef_map->l_name[0] == '\0') _dl_debug_printf ("\ -marking %s [%lu] as NODELETE due to reference to main program\n", +marking %s [%lu] as NODELETE due to reference from main program\n", map->l_name, map->l_ns); else _dl_debug_printf ("\ -marking %s [%lu] as NODELETE due to reference to %s [%lu]\n", +marking %s [%lu] as NODELETE due to reference from %s [%lu]\n", map->l_name, map->l_ns, undef_map->l_name, undef_map->l_ns); }