public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org>
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"
Date: Wed, 26 Oct 2022 14:50:04 +0000 (GMT)	[thread overview]
Message-ID: <20221026145004.87FC93851507@sourceware.org> (raw)

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,

                 reply	other threads:[~2022-10-26 14:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221026145004.87FC93851507@sourceware.org \
    --to=nsz@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).