From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 833113853D7D; Wed, 23 Nov 2022 14:48:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 833113853D7D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214885; bh=Grp8brQWFkUHcOEm/D141wW0gKXTRj7rzqNPPDi7GkQ=; h=From:To:Subject:Date:From; b=khJv7Jjc7d6DMLbgSbxUG8SuZWajnl1uF5/o38L0ORyzWJJqAoLgREAYtoF6p5PCa 37joZm72rKqMPw31XIcjHKL/BDpwxHZ79iNvsEJLLwtu0Go9+PhI7jl4QC1w+NEaZX 9ZD6wAdMIvGx56m17NEfJnVnHgQAZecR5cKsmIn8= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] TODO(pldd): cheri: elf: fix pldd to compile for purecap abi X-Act-Checkin: glibc X-Git-Author: Carlos Eduardo Seo X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 10247e0d2fad3794c8443b78fc39a2e271fe15eb X-Git-Newrev: 025e8cb8d9af704636b523b29bca4eb17aad50d0 Message-Id: <20221123144805.833113853D7D@sourceware.org> Date: Wed, 23 Nov 2022 14:48:05 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=025e8cb8d9af704636b523b29bca4eb17aad50d0 commit 025e8cb8d9af704636b523b29bca4eb17aad50d0 Author: Carlos Eduardo Seo 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 +#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");