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] cheri: rtld: fix _dl_start to return elfptr_t Date: Fri, 5 Aug 2022 19:36:31 +0000 (GMT) [thread overview] Message-ID: <20220805193631.1BE0F385696A@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=06fda784450ff505a14c0af87a5c68e153b08b31 commit 06fda784450ff505a14c0af87a5c68e153b08b31 Author: Szabolcs Nagy <szabolcs.nagy@arm.com> 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. Diff: --- 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 #endif #ifdef DONT_USE_BOOTSTRAP_MAP -static ElfW(Addr) _dl_start_final (void *arg); +static elfptr_t _dl_start_final (void *arg); #else 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); #endif /* These are defined magically by the linker. */ @@ -446,10 +446,10 @@ RTLD_START this function is not inlined (see below). */ #ifdef DONT_USE_BOOTSTRAP_MAP -static inline ElfW(Addr) __attribute__ ((always_inline)) +static inline elfptr_t __attribute__ ((always_inline)) _dl_start_final (void *arg) #else -static ElfW(Addr) __attribute__ ((noinline)) +static elfptr_t __attribute__ ((noinline)) _dl_start_final (void *arg, struct dl_start_final_info *info) #endif { @@ -515,7 +515,7 @@ _dl_start_final (void *arg, struct dl_start_final_info *info) # define bootstrap_map info.l #endif -static ElfW(Addr) __attribute_used__ +static elfptr_t __attribute_used__ _dl_start (void *arg) { #ifdef DONT_USE_BOOTSTRAP_MAP
reply other threads:[~2022-08-05 19:36 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=20220805193631.1BE0F385696A@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: linkBe 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).