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] TODO(pldd): cheri: elf: fix pldd to compile for purecap abi Date: Fri, 5 Aug 2022 19:38:02 +0000 (GMT) [thread overview] Message-ID: <20220805193802.55D973857363@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7f9c78bc3a0eaa7bc5f04a585bdaf672c6578e9a commit 7f9c78bc3a0eaa7bc5f04a585bdaf672c6578e9a Author: Carlos Eduardo Seo <carlos.seo@arm.com> Date: Tue Jul 5 22:09:03 2022 +0000 TODO(pldd): cheri: elf: fix pldd to compile for purecap abi Adjust types in the E(*) structs to support capabilities. TODO: purecap pldd should refuse to deal with lp64 and ELF32 processes. the code for the 32bit case should be disabled. TODO: a correct fix requires support for all abis that can run on the same system (purecap, lp64 and ELF32 too). Diff: --- elf/pldd-xx.c | 58 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/elf/pldd-xx.c b/elf/pldd-xx.c index 30513b423f..cddec459d7 100644 --- a/elf/pldd-xx.c +++ b/elf/pldd-xx.c @@ -24,6 +24,7 @@ #include <dl-r_debug.h> +#ifndef __CHERI_PURE_CAPABILITY__ struct E(link_map) { EW(Addr) l_addr; @@ -35,6 +36,48 @@ struct E(link_map) Lmid_t l_ns; EW(Addr) l_libname; }; + +struct E(libname_list) +{ + EW(Addr) name; + EW(Addr) next; +}; + +struct E(r_debug) +{ + int r_version; +# if CLASS == 64 + int pad; +# endif + EW(Addr) r_map; +}; +#else +struct E(link_map) +{ + uintptr_t l_addr; + uintptr_t l_name; + uintptr_t l_ld; + uintptr_t l_next; + uintptr_t l_prev; + uintptr_t l_real; + Lmid_t l_ns; + uintptr_t l_libname; +}; + +struct E(libname_list) +{ + uintptr_t name; + uintptr_t next; +}; + +struct E(r_debug) +{ + int r_version; + int pad; + uintptr_t r_map; +}; +#endif + #if CLASS == __ELF_NATIVE_CLASS _Static_assert (offsetof (struct link_map, l_addr) == offsetof (struct E(link_map), l_addr), "l_addr"); @@ -44,27 +87,12 @@ _Static_assert (offsetof (struct link_map, l_next) == offsetof (struct E(link_map), l_next), "l_next"); #endif - -struct E(libname_list) -{ - EW(Addr) name; - EW(Addr) next; -}; #if CLASS == __ELF_NATIVE_CLASS _Static_assert (offsetof (struct libname_list, name) == offsetof (struct E(libname_list), name), "name"); _Static_assert (offsetof (struct libname_list, next) == offsetof (struct E(libname_list), next), "next"); #endif - -struct E(r_debug) -{ - int r_version; -#if CLASS == 64 - int pad; -#endif - EW(Addr) r_map; -}; #if CLASS == __ELF_NATIVE_CLASS _Static_assert (offsetof (struct r_debug, r_version) == offsetof (struct E(r_debug), r_version), "r_version");
next reply other threads:[~2022-08-05 19:38 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-08-05 19:38 Szabolcs Nagy [this message] 2022-10-26 15:19 Szabolcs Nagy 2022-10-27 13:58 Szabolcs Nagy 2022-11-23 14:48 Szabolcs Nagy
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=20220805193802.55D973857363@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).