From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 3F7753851535; Thu, 27 Oct 2022 13:58:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3F7753851535 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666879108; bh=HChg/Qc2APhpNPqZkOgE2/MLGtP1NSBVBry5D8LWsqA=; h=From:To:Subject:Date:From; b=cW1nULJihafFefbhW36tk7VPbww/51Wubw3FvFAofurt4AE/DfcDTwDDhsNh1VNBd fd7r92ihf8IwmDucjD9E91kn88sD0V/vJLrfY7iGs9Salb17oXKLG3aNgoluq9T7Ze sKfC0vFRU/jZbCu9iOZk7TVtcrkPx6fTDe2VcEl8= 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] cheri: elf: Prepare support for dynamic relocation processing X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 010cf0128e02429c8686772f20cf80b2ca678939 X-Git-Newrev: 6716729644e3ada162b4771b0d5852140142bc42 Message-Id: <20221027135828.3F7753851535@sourceware.org> Date: Thu, 27 Oct 2022 13:58:28 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6716729644e3ada162b4771b0d5852140142bc42 commit 6716729644e3ada162b4771b0d5852140142bc42 Author: Szabolcs Nagy Date: Thu Oct 20 17:12:36 2022 +0100 cheri: elf: Prepare support for dynamic relocation processing Type of relocation addresses must be changed from ElfW(Addr) to elfptr_t to cover both traditional and CHERI ABIs. And relative relocation processing must have access to the link_map to derive pointers from the right per module capability. Diff: --- elf/do-rel.h | 2 +- elf/dynamic-link.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/elf/do-rel.h b/elf/do-rel.h index 694b3a6bd7..219fad2318 100644 --- a/elf/do-rel.h +++ b/elf/do-rel.h @@ -41,7 +41,7 @@ static inline void __attribute__ ((always_inline)) elf_dynamic_do_Rel (struct link_map *map, struct r_scope_elem *scope[], - ElfW(Addr) reladdr, ElfW(Addr) relsize, + elfptr_t reladdr, ElfW(Addr) relsize, __typeof (((ElfW(Dyn) *) 0)->d_un.d_val) nrelative, int lazy, int skip_ifunc) { diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h index debbb8c9f7..e189de49eb 100644 --- a/elf/dynamic-link.h +++ b/elf/dynamic-link.h @@ -46,9 +46,14 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], const ElfW(Rela) *reloc, const ElfW(Sym) *sym, const struct r_found_version *version, void *const reloc_addr, int skip_ifunc); +# ifdef __CHERI_PURE_CAPABILITY__ +static inline void __attribute__((always_inline)) +elf_machine_rela_relative (struct link_map *map, const ElfW(Rela) *reloc); +# else static inline void __attribute__((always_inline)) elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc, void *const reloc_addr); +# endif # endif # if ELF_MACHINE_NO_RELA || defined ELF_MACHINE_PLT_REL static inline void __attribute__((always_inline)) @@ -80,7 +85,7 @@ elf_machine_lazy_rel (struct link_map *map, struct r_scope_elem *scope[], # define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, scope, do_lazy, skip_ifunc, test_rel) \ do { \ - struct { ElfW(Addr) start, size; \ + struct { elfptr_t start; ElfW(Addr) size; \ __typeof (((ElfW(Dyn) *) 0)->d_un.d_val) nrelative; int lazy; } \ ranges[2] = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 } }; \ \ @@ -97,7 +102,7 @@ elf_machine_lazy_rel (struct link_map *map, struct r_scope_elem *scope[], if ((map)->l_info[DT_PLTREL] \ && (!test_rel || (map)->l_info[DT_PLTREL]->d_un.d_val == DT_##RELOC)) \ { \ - ElfW(Addr) start = D_PTR ((map), l_info[DT_JMPREL]); \ + elfptr_t start = D_PTR ((map), l_info[DT_JMPREL]); \ ElfW(Addr) size = (map)->l_info[DT_PLTRELSZ]->d_un.d_val; \ \ if (ranges[0].start == 0) \