From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id BB0B6385E001; Wed, 12 Oct 2022 14:17:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB0B6385E001 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665584261; bh=+H0rtKfurciUmSKXUyucCncmac37LIZOeRdu7oSTC9U=; h=From:To:Subject:Date:From; b=gMdLnRA244FzR3qAAonDHUA/rMUsysUjTFDHmm3RqC6vQVeECWoADhcn+eSNfX0uz RWP/VV2pDnX+nOTNZ/V3fMBuOzd+Idf/qI3i4eAGm99/cQX8932VFHWDS6ZF+1jRsi a/24udrkKwR1Q5ZGobHaHItRgHkAgRALD8V7uOAA= 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] aarch64: morello: add D_PTR_RW X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: e6a2c4c4bbb922fd326e5085cd1f28d5265ade6d X-Git-Newrev: a1d26f7b1d8d78588c6fd301515a07f92883b150 Message-Id: <20221012141741.BB0B6385E001@sourceware.org> Date: Wed, 12 Oct 2022 14:17:41 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a1d26f7b1d8d78588c6fd301515a07f92883b150 commit a1d26f7b1d8d78588c6fd301515a07f92883b150 Author: Szabolcs Nagy Date: Thu Sep 1 16:43:19 2022 +0100 aarch64: morello: add D_PTR_RW Writable version of D_PTR, required for updating GOT[1] and GOT[2]. Diff: --- sysdeps/aarch64/ldsodefs.h | 4 ++++ sysdeps/aarch64/morello/dl-machine.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sysdeps/aarch64/ldsodefs.h b/sysdeps/aarch64/ldsodefs.h index b0b23df93c..e86c7e1e0e 100644 --- a/sysdeps/aarch64/ldsodefs.h +++ b/sysdeps/aarch64/ldsodefs.h @@ -25,6 +25,10 @@ #ifdef __CHERI_PURE_CAPABILITY__ # define DO_ELF_MACHINE_REL_RELATIVE(map, l_addr, relative) \ elf_machine_rela_relative (map, relative) + +#define D_PTR_RW(map, i) \ + (dl_relocate_ld (map) ? (map)->i->d_un.d_ptr \ + : dl_rw_ptr ((map), (map)->i->d_un.d_ptr)) #endif struct La_aarch64_regs; diff --git a/sysdeps/aarch64/morello/dl-machine.h b/sysdeps/aarch64/morello/dl-machine.h index 4eaffc2cf6..e6c69fc321 100644 --- a/sysdeps/aarch64/morello/dl-machine.h +++ b/sysdeps/aarch64/morello/dl-machine.h @@ -53,7 +53,7 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], extern void _dl_runtime_resolve (ElfW(Word)); extern void _dl_runtime_profile (ElfW(Word)); - got = (uintptr_t *) D_PTR (l, l_info[DT_PLTGOT]); + got = (uintptr_t *) D_PTR_RW (l, l_info[DT_PLTGOT]); if (got[1]) { l->l_mach.plt = (uint64_t) got[1] + l->l_addr;