From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Fri, 21 Oct 2022 14:51:49 +0000 (+0100)
Subject: TODO: more l_addr cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b4ae2ffd243ce637fe82c912c0e863b9c660ab;p=thirdparty%2Fglibc.git

TODO: more l_addr cleanup

TODO: squash into

  commit f2f4f441fbda6080d0ff742f3bb535c09315ef98
  cheri: elf: Turn l_addr back to ElfW(Addr)
---

diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index d0d9a51716e..4656015ea21 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -355,7 +355,7 @@ _dl_protect_relro (struct link_map *l)
 {
   elfptr_t start = ALIGN_DOWN(dl_rx_ptr (l, l->l_relro_addr),
 				GLRO(dl_pagesize));
-  elfptr_t end = ALIGN_DOWN((l->l_addr
+  ElfW(Addr) end = ALIGN_DOWN((l->l_addr
 			       + l->l_relro_addr
 			       + l->l_relro_size),
 			      GLRO(dl_pagesize));