diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-10-20 17:12:36 +0100 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-11-22 14:31:25 +0000 |
| commit | 046ce0eb112e596fbb5437e809d2f575388e61c1 (patch) | |
| tree | 1f94044da39eabe53b8da3a1ef3467ef3e9fd9ef | |
| parent | 82f650eec80df339f1a8144039623a575f756161 (diff) | |
| download | glibc-046ce0eb112e596fbb5437e809d2f575388e61c1.tar.gz | |
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.
| -rw-r--r-- | elf/do-rel.h | 2 | ||||
| -rw-r--r-- | 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) \ |