public inbox for
help / color / mirror / Atom feed
* [glibc/arm/morello/main] cheri: rtld: fix _dl_start to return elfptr_t
@ 2022-08-05 19:36 Szabolcs Nagy
  0 siblings, 0 replies; only message in thread
From: Szabolcs Nagy @ 2022-08-05 19:36 UTC (permalink / raw)
  To: glibc-cvs;h=06fda784450ff505a14c0af87a5c68e153b08b31

commit 06fda784450ff505a14c0af87a5c68e153b08b31
Author: Szabolcs Nagy <>
Date:   Wed Apr 20 09:54:31 2022 +0100

    cheri: rtld: fix _dl_start to return elfptr_t
    Functions returning a pointer to the user entry need to use an int type
    that can represent pointers.

 elf/rtld.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/elf/rtld.c b/elf/rtld.c
index cbbaf4a331..2c61935a21 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -416,15 +416,15 @@ DL_SYSINFO_IMPLEMENTATION
-static ElfW(Addr) _dl_start_final (void *arg);
+static elfptr_t _dl_start_final (void *arg);
 struct dl_start_final_info
   struct link_map l;
   RTLD_TIMING_VAR (start_time);
-static ElfW(Addr) _dl_start_final (void *arg,
-				   struct dl_start_final_info *info);
+static elfptr_t _dl_start_final (void *arg,
+				 struct dl_start_final_info *info);
 /* These are defined magically by the linker.  */
@@ -446,10 +446,10 @@ RTLD_START
    this function is not inlined (see below).  */
-static inline ElfW(Addr) __attribute__ ((always_inline))
+static inline elfptr_t __attribute__ ((always_inline))
 _dl_start_final (void *arg)
-static ElfW(Addr) __attribute__ ((noinline))
+static elfptr_t __attribute__ ((noinline))
 _dl_start_final (void *arg, struct dl_start_final_info *info)
@@ -515,7 +515,7 @@ _dl_start_final (void *arg, struct dl_start_final_info *info)
 # define bootstrap_map info.l
-static ElfW(Addr) __attribute_used__
+static elfptr_t __attribute_used__
 _dl_start (void *arg)

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-08-05 19:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-05 19:36 [glibc/arm/morello/main] cheri: rtld: fix _dl_start to return elfptr_t 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).