diff options
| author | Kito Cheng <kito.cheng@sifive.com> | 2022-06-23 23:47:04 +0800 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2022-06-23 21:07:19 -0700 |
| commit | 58fc66a91ca511cc12901cb599914f31948e02d5 (patch) | |
| tree | 3f778f0a823c2f22c91ba87165a402a14f5d12dd | |
| parent | bd42891bb38d43878d0a9e204a183dbae4a2c6d0 (diff) | |
| download | glibc-58fc66a91ca511cc12901cb599914f31948e02d5.tar glibc-58fc66a91ca511cc12901cb599914f31948e02d5.tar.gz glibc-58fc66a91ca511cc12901cb599914f31948e02d5.tar.bz2 glibc-58fc66a91ca511cc12901cb599914f31948e02d5.zip | |
riscv: Use elf_machine_rela_relative to handle R_RISCV_RELATIVE
Minor clean-up, we need to change this part in following patch, clean this up
to prevent we duplicated the change twice.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
| -rw-r--r-- | sysdeps/riscv/dl-machine.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sysdeps/riscv/dl-machine.h b/sysdeps/riscv/dl-machine.h index a60a452952..4bb858adaa 100644 --- a/sysdeps/riscv/dl-machine.h +++ b/sysdeps/riscv/dl-machine.h @@ -152,6 +152,14 @@ elf_machine_fixup_plt (struct link_map *map, lookup_t t, #ifdef RESOLVE_MAP +static inline void +__attribute__ ((always_inline)) +elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc, + void *const reloc_addr) +{ + *(ElfW(Addr) *) reloc_addr = l_addr + reloc->r_addend; +} + /* Perform a relocation described by R_INFO at the location pointed to by RELOC_ADDR. SYM is the relocation symbol specified by R_INFO and MAP is the object containing the reloc. */ @@ -182,7 +190,7 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], switch (r_type) { case R_RISCV_RELATIVE: - *addr_field = map->l_addr + reloc->r_addend; + elf_machine_rela_relative (map->l_addr, reloc, addr_field); break; case R_RISCV_JUMP_SLOT: case __WORDSIZE == 64 ? R_RISCV_64 : R_RISCV_32: @@ -260,14 +268,6 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], static inline void __attribute__ ((always_inline)) -elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc, - void *const reloc_addr) -{ - *(ElfW(Addr) *) reloc_addr = l_addr + reloc->r_addend; -} - -static inline void -__attribute__ ((always_inline)) elf_machine_lazy_rel (struct link_map *map, struct r_scope_elem *scope[], ElfW(Addr) l_addr, const ElfW(Rela) *reloc, int skip_ifunc) |