From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1992) id D17C6385697C; Fri, 24 Jun 2022 04:10:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D17C6385697C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Palmer Dabbelt To: glibc-cvs@sourceware.org Subject: [glibc] riscv: Use elf_machine_rela_relative to handle R_RISCV_RELATIVE X-Act-Checkin: glibc X-Git-Author: Kito Cheng X-Git-Refname: refs/heads/master X-Git-Oldrev: bd42891bb38d43878d0a9e204a183dbae4a2c6d0 X-Git-Newrev: 58fc66a91ca511cc12901cb599914f31948e02d5 Message-Id: <20220624041025.D17C6385697C@sourceware.org> Date: Fri, 24 Jun 2022 04:10:25 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jun 2022 04:10:25 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=58fc66a91ca511cc12901cb599914f31948e02d5 commit 58fc66a91ca511cc12901cb599914f31948e02d5 Author: Kito Cheng Date: Thu Jun 23 23:47:04 2022 +0800 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 Signed-off-by: Palmer Dabbelt Diff: --- sysdeps/riscv/dl-machine.h | 18 +++++++++--------- 1 file 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: @@ -258,14 +266,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[],