public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/arm/morello/main] Revert "TODO(l_addr): cheri: rtld: elfptr_t fix in rtld.c program header processing"
@ 2022-10-26 14:50 Szabolcs Nagy
  0 siblings, 0 replies; only message in thread
From: Szabolcs Nagy @ 2022-10-26 14:50 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8593166279495e005a03dee9886e2b33114c3fa5

commit 8593166279495e005a03dee9886e2b33114c3fa5
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
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,

^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2022-10-26 14:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-26 14:50 [glibc/arm/morello/main] Revert "TODO(l_addr): cheri: rtld: elfptr_t fix in rtld.c program header processing" Szabolcs Nagy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).