From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Fri, 21 Oct 2022 14:37:29 +0000 (+0100)
Subject: Revert "TODO(l_addr): cheri: rtld: elfptr_t fix in rtld.c program header processing"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8593166279495e005a03dee9886e2b33114c3fa5;p=thirdparty%2Fglibc.git

Revert "TODO(l_addr): cheri: rtld: elfptr_t fix in rtld.c program header processing"

This reverts commit 93ab84cd80067744fb990d0f420dafc04a18d4cb.
---

diff --git a/elf/rtld.c b/elf/rtld.c
index daff17a9e18..6f1c06eec0c 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,