From nobody Thu Jan 18 22:26:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TGHQq6zMXz578Wc; Thu, 18 Jan 2024 22:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TGHQq1RzNz42H6; Thu, 18 Jan 2024 22:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705616787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ABtzGKUfB8Fdghr1RIpbSHP5Uzf37tv1I0yqa6Y7jU=; b=Gd8EVJaIqImsfL0DuKlTkWroH397b1ET4zqBEVx/k2XbhWsAQoudBxT3pymWMmsqfkxEbS Jf6ZUVutpUYETjS84bwo0vlvJRpfG3JlcuErq5yZro2X9X2L/jd37dTFB8R7amj6mBYLJi guWHsdO9+8zRN8iPx3CnDjChVQZJWyPTOikZjaooETmtQMlSfzG3UFvp8+sudTHBEmHK67 AC+WfL9bsK1ReNvdlbtfkjUuATWbusLW4SpuDdM6j261v0pz5n8xnZS8/GeVxjIQ3JDZ0S UcfyKvS5njLuayIBRvFwsZaG6wLx8SRNMcGqaFo5wMleszPw7t+XK2T08/pEFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705616787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ABtzGKUfB8Fdghr1RIpbSHP5Uzf37tv1I0yqa6Y7jU=; b=pSxgwkwIHV4O0X9RTGy08xItMNiC1v4ToH3o4MBRgSNPFaz5jSSqueqI5vI2OSZiOf3iTt 40xEIKkU0fW8Wkh0nQBJH4QRyTuNbRzbEhbLMljOzBHOaZK3IsYXwAzCDKbrOHCsUCc/jC HZuIfKcEU4Ys3RlADtlfo/IEd4l5A3xT7C0K+5iS45vJqMA5ervHMoHcgVZ92QQ3UxtuJ0 vwVT3D62/3PGUqLBnirTk2WXW/km2qumocbv/BH5Vt1FxI2BN+xbDXe4S7MCBdkri0tUM8 WnPQ32Ux55DQY0GG4PuedQF4TIuZiH8nGSOTHgL5dONBEUuQ/xfuB5B1TjRVVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705616787; a=rsa-sha256; cv=none; b=c8TrNyUE6kkQn//x1vxXIvpu85uWBaaCF/UcYkseGqEX1rAuUMcfvMx9TOGOO6e9TIM3ju HuwX3qeZ3pflJqXpjk19lz+bLOV8tleY7lOwYDQyLLydehwSbUrpIgCmWgixJmSwg2MX8e ZcsFSebhgoUrz8P1LZU4PcRb0TiCjg9T0FRIQsc35Ud3w1enIkxb9eW+QEoeSv8zyj1KZx IUJEajrvwnW3myJQv3TDbf7p2WlBMY7iJ1NsMn2nCWipgwZ12mdur/VOmzwEIqT/IUimji wu0ER52B+VtTpM8iWCvyzeGpSBhTE0yKGLsjVSFVmdtd5f2f6VV0cv4zf2S3oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TGHQq0Yv4zQ4b; Thu, 18 Jan 2024 22:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40IMQQKP090425; Thu, 18 Jan 2024 22:26:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IMQQSW090422; Thu, 18 Jan 2024 22:26:26 GMT (envelope-from git) Date: Thu, 18 Jan 2024 22:26:26 GMT Message-Id: <202401182226.40IMQQSW090422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 09371fa6622e - stable/13 - kldxref: Implement aarch64 R_AARCH64_AB64 relocation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 09371fa6622ebb025a87439b21c5d4835aa80108 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=09371fa6622ebb025a87439b21c5d4835aa80108 commit 09371fa6622ebb025a87439b21c5d4835aa80108 Author: Jessica Clarke AuthorDate: 2023-12-14 20:17:20 +0000 Commit: John Baldwin CommitDate: 2024-01-18 21:30:49 +0000 kldxref: Implement aarch64 R_AARCH64_AB64 relocation Doing nothing seems to be sufficient but is strange, inconsistent with other architectures, and not necessary when it's easy to support properly. (cherry picked from commit aaba1490ec4b17dea750b1e58dfded7aeb4e9816) --- usr.sbin/kldxref/ef_aarch64.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/kldxref/ef_aarch64.c b/usr.sbin/kldxref/ef_aarch64.c index f1e499e76ef1..4365a7ff1f66 100644 --- a/usr.sbin/kldxref/ef_aarch64.c +++ b/usr.sbin/kldxref/ef_aarch64.c @@ -43,8 +43,8 @@ ef_aarch64_reloc(struct elf_file *ef, const void *reldata, Elf_Type reltype, GElf_Addr relbase, GElf_Addr dataoff, size_t len, void *dest) { char *where; - Elf64_Addr addend; - GElf_Size rtype; + GElf_Addr addr, addend; + GElf_Size rtype, symidx; const GElf_Rela *rela; if (reltype != ELF_T_RELA) @@ -54,6 +54,7 @@ ef_aarch64_reloc(struct elf_file *ef, const void *reldata, Elf_Type reltype, where = (char *)dest - dataoff + rela->r_offset; addend = rela->r_addend; rtype = GELF_R_TYPE(rela->r_info); + symidx = GELF_R_SYM(rela->r_info); if (where < (char *)dest || where >= (char *)dest + len) return (0); @@ -63,6 +64,8 @@ ef_aarch64_reloc(struct elf_file *ef, const void *reldata, Elf_Type reltype, le64enc(where, relbase + addend); break; case R_AARCH64_ABS64: + addr = EF_SYMADDR(ef, symidx) + addend; + le64enc(where, addr); break; default: warnx("unhandled relocation type %d", (int)rtype);