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 daff17a9e18401544be2a0ed82adfae66d30c09b..6f1c06eec0c475c7d386e0896478027e1e467c62 100644 (file)
--- 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,