From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2138) id 3586B3858C2D; Mon, 29 Jan 2024 17:27:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3586B3858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1706549276; bh=wFWsmtLHMAaDb7Lvimd51HetHDQ1l9jcamFeYpLynFU=; h=From:To:Subject:Date:From; b=ARFI2H2DwyNrmy5FOt3UquvXi+/ofqjUcAgGi0QNcmjtfcKHBxUJkNy0C+zEV11QA uldUfqMJtkdTpl9MsQVHvpCDS9tXFjCJLUBwBIYuo1jj9p1Dk5pnkZcJKrMa0bB1HX Z0swoI6IMiuU7WLBOgb06Rz1lduFfw7Suq7kpqB4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Andreas Schwab To: glibc-cvs@sourceware.org Subject: [glibc] elf: correct relocation statistics for !ELF_MACHINE_START_ADDRESS X-Act-Checkin: glibc X-Git-Author: Andreas Schwab X-Git-Refname: refs/heads/master X-Git-Oldrev: ae49a7b29acc184b03c2a6bd6ac01b5e08efd54f X-Git-Newrev: 9c72830eb3e12c1d57ac7d1992c96ee69ccd835d Message-Id: <20240129172756.3586B3858C2D@sourceware.org> Date: Mon, 29 Jan 2024 17:27:56 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9c72830eb3e12c1d57ac7d1992c96ee69ccd835d commit 9c72830eb3e12c1d57ac7d1992c96ee69ccd835d Author: Andreas Schwab Date: Mon Jan 29 17:01:07 2024 +0100 elf: correct relocation statistics for !ELF_MACHINE_START_ADDRESS Fixes: 6628c742b2 ("elf: Remove prelink support") Diff: --- elf/rtld.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/elf/rtld.c b/elf/rtld.c index 4f494b792e..ac4bb23652 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -2815,10 +2815,9 @@ print_statistics (const hp_timing_t *rtld_total_timep) num_relative_relocations += l->l_info[VERSYMIDX (DT_RELCOUNT)]->d_un.d_val; #ifndef ELF_MACHINE_REL_RELATIVE - /* Relative relocations are processed on these architectures if - library is loaded to different address than p_vaddr. */ - if ((l->l_addr != 0) - && l->l_info[VERSYMIDX (DT_RELACOUNT)]) + /* Relative relocations are always processed on these + architectures. */ + if (l->l_info[VERSYMIDX (DT_RELACOUNT)]) #else /* On e.g. IA-64 or Alpha, relative relocations are processed only if library is loaded to different address than p_vaddr. */