From nobody Thu Dec 14 20:18:16 2023 X-Original-To: dev-commits-src-main@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 4SrkF51M26z53jPc; Thu, 14 Dec 2023 20:18:17 +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 4SrkF50jbdz4RlQ; Thu, 14 Dec 2023 20:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702585097; 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=+GNG+SVdlhDm0qBozjx3DqFA+PDq/zKlWFj1yRpXuKs=; b=Upap4QOLI0FdW7wM04x6BOkLE7W1LiEYGHNhQMaQ8j0X/yD1DoQ5HWze/WxWCIioafHPij LcN97B/DrRN7GRyUfjGYlwKvXoFkR5R/iMYV6HtU4/2QcOq+oOaKJObAnS6SEKqlzlG0qn Y0pG6cOhpGfkVBpu1FcT7IMeVPwTBV8QjltMD0w1BUnsGG4YkVwoU47lgDJaIJMIBlWPbV w9eHyqyh2iG4UEl9G1e9srRz7VidBNyy3ZjQXYvRoLaEJWVJgR4k0iaQkqJy0cOjRzmfLR R0N+CUlVW56b8MVzDpuczhe8HuWCiZzRdd81xbh/yYrbFKUi7p8hknV3ClwG1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702585097; a=rsa-sha256; cv=none; b=lstD+5FfZ4Uwb1EuREjEI0D4OnwMalYron6rKNz2WicRzjz1lS2jVZnQsAuUqTLpchn2iO 5G9eueFFoIZCkUneIVlWt1GOYjvvxpinO6LDLSCuiiS8EvnROdf1Brm1jQOF59cshJ+2/z qkBGGx4w+td8h9XNWcOBAJscu7QXXYD6vjSRXOgkSqVLurpTwzzTAMUSkwlvYu1lslDy53 J8ueQbJBowv6Qf+LKahWaNeLxHkp13to5ngtdc4NB/c3cem+86hTuOfoRTMCFBtLTSs+WS rkxaP8yDrvUZCJNvQVxq63vFMwg/XOhJMtCeN+tF1wxB+3fliS4YA4ZrKuZXEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702585097; 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=+GNG+SVdlhDm0qBozjx3DqFA+PDq/zKlWFj1yRpXuKs=; b=RP0vbCBtvYVkELjMQ3HLFughz+7b665gLo1EVxvJ0W5YOMNCO7O7MlClbDFUY+pi7D4H6P OWk20bIpWjrozBPjyiAsnrWJ+cjjE0RgauF55LqXFmuSZZSo2KmdO2p4uk3ylLx5OyFfWx QtkYFK8C+owf7labDU2+HnxfdrnjE/vQcRgqauWPHT7DuSMA11dzO5KJzIu/zxY0bzjPz0 fn3KmAlJknAY0EJqC2vFjZkyXjp0XTy9QJ5YnGXgALXLy+0Jdvq61dr1h4jtLwJnhfhyzm 4c3zVOCIWeabokYJH7w2xoVwsXYm6vWzeD80qJ5+J40fgQ5P8TosnYIp1Ii8Nw== 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 4SrkF46s89zh5h; Thu, 14 Dec 2023 20:18:16 +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 3BEKIGCv036161; Thu, 14 Dec 2023 20:18:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEKIGEb036158; Thu, 14 Dec 2023 20:18:16 GMT (envelope-from git) Date: Thu, 14 Dec 2023 20:18:16 GMT Message-Id: <202312142018.3BEKIGEb036158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: aaba1490ec4b - main - kldxref: Implement aarch64 R_AARCH64_AB64 relocation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aaba1490ec4b17dea750b1e58dfded7aeb4e9816 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=aaba1490ec4b17dea750b1e58dfded7aeb4e9816 commit aaba1490ec4b17dea750b1e58dfded7aeb4e9816 Author: Jessica Clarke AuthorDate: 2023-12-14 20:17:20 +0000 Commit: Jessica Clarke CommitDate: 2023-12-14 20:17:20 +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. --- 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);