From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 87FC93851507; Wed, 26 Oct 2022 14:50:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 87FC93851507 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666795804; bh=yQ/hNJONDkLW4Ll1LzgRt53/BykTJB/vJtGbvLeao+U=; h=From:To:Subject:Date:From; b=rKL3+0a+fWc0TrjO6beK/BNgQUGc+BFf9+34N3rrEsD4AIYw9s69lh7FfIxn03smb GViOIiiudUR1hdv4j8famqqePFwGBFOEc+GvKzEc9hstLDQZe/NQHFyiInM7Mg5GU3 /OmnUx47dOsZlbVthfGYTPhGZSLppUeLH85jxi6k= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] Revert "TODO(l_addr): cheri: rtld: elfptr_t fix in rtld.c program header processing" X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: bf969db943228fa1d2bf21e0053687bbdd241500 X-Git-Newrev: 8593166279495e005a03dee9886e2b33114c3fa5 Message-Id: <20221026145004.87FC93851507@sourceware.org> Date: Wed, 26 Oct 2022 14:50:04 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8593166279495e005a03dee9886e2b33114c3fa5 commit 8593166279495e005a03dee9886e2b33114c3fa5 Author: Szabolcs Nagy Date: Fri Oct 21 15:37:29 2022 +0100 Revert "TODO(l_addr): cheri: rtld: elfptr_t fix in rtld.c program header processing" This reverts commit 93ab84cd80067744fb990d0f420dafc04a18d4cb. Diff: --- elf/rtld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elf/rtld.c b/elf/rtld.c index daff17a9e1..6f1c06eec0 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1170,7 +1170,7 @@ rtld_setup_main_map (struct link_map *main_map) { case PT_PHDR: /* Find out the load address. */ - main_map->l_addr = (elfptr_t) phdr - ph->p_vaddr; + main_map->l_addr = (ElfW(Addr)) phdr - ph->p_vaddr; break; case PT_DYNAMIC: /* This tells us where to find the dynamic section,