From nobody Fri Oct 28 14:10:55 2022 X-Original-To: dev-commits-src-branches@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 4MzPbM5MVZz4gBM7; Fri, 28 Oct 2022 14:10:55 +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 4MzPbM4pwXz3j6f; Fri, 28 Oct 2022 14:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666966255; 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=kGg3UaAvSddey/alkkCHjUFCoFoPX/JaXVu0QCB0l0Q=; b=SjpVefW+EsMN/sFb+S2ZSzXM+Ym9ZiWK40Ia4EihfKjtA7cdLf6VnaZeXo0lWItCnGM84S XsMl/vnP9w34mkTEhYlCNzGnl8HxoVoadCrG+sOjY/faW4jsj5mfOIQyaSY/9GtUg3nizD y67ZvfkKHzpk3HXTEFLcspI8Zgfr5vTpXYEdCJ+La5u7dv1+V9xQN5U1CNBY9HZ08ha52Y yUJj6N521ZQFJNHOKamVDdHpc6y9Ra7i9E3uQcfXH+1ETI8b0dI5MT7CrrC4/CFRX6pmGd X0B8NBa2P8s6XLwuLJzAvTsYoEXYwTY9egKhogdOk2kOZKiy9wN6RRUl2Gy3Iw== 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 4MzPbM3thxzgcZ; Fri, 28 Oct 2022 14:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29SEAtWN037282; Fri, 28 Oct 2022 14:10:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29SEAtaY037281; Fri, 28 Oct 2022 14:10:55 GMT (envelope-from git) Date: Fri, 28 Oct 2022 14:10:55 GMT Message-Id: <202210281410.29SEAtaY037281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9f810201f020 - stable/13 - kldxref: handle R_RISCV_64 relocation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9f810201f0207872a2223091d70376fd74ab0d40 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666966255; 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=kGg3UaAvSddey/alkkCHjUFCoFoPX/JaXVu0QCB0l0Q=; b=RFblxMFz7HBPSlvGehNfkOOTV+sRrnd6Szok5Ekt6kP1QjdsR5HBD/5Yc0allIu58wrJLi rGCJwaq3uNYsLK31yr8qYvmmDyYseEiqXViO0VurPzJ94Cgszszs/FOg78mKBUuRNtGkzC BS9Y/fNedQ4LHLOBJYrfSmJCL11akoq6U/IkfqxZRrVEYmAhn9JqGyqAVu2kRz1RJt/alH FA1S87i5GA2HkmbFVRioxhm4WrXmv03tIJsGOOqN5PwT9vQ8ZbRFKysBzB32BBbZsOui9H J2anyT5+E2+I+PYh9pXAMJJTuodTTUCqf+//nKyfq7UvebGkOVOLxQbhl/7Efg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666966255; a=rsa-sha256; cv=none; b=T8mPRD2d6avSm9lPYsUbwfHRq2e+EHYuys2P2iqP4ebJ0M16R/YiQ/dZGhu89PWfRSVX0a 98hrYotaANGb/VL+PgFsJgyxiDB6oefMPIBzHCDygGPC6MAbx2BEs04SEsw9oKyrySMN9u dn/KimqsTTswO/KjcJi584Khwtu9SYzinTx670ANnF60TIgXpBj//9+36TQXVB/rtmC0yF qymm4d8SAX7OOR8ivlcx2Vsh5QZH3xpEE3acM5oYM9gTjrw18xRYczwrxLrZQIaU1cYTat rhxWwZp0NOR6vRbIV1TVFYto8q8hHWjtEGMEKPjZxE9kPCg2LvIcnWWx/47B/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9f810201f0207872a2223091d70376fd74ab0d40 commit 9f810201f0207872a2223091d70376fd74ab0d40 Author: Mitchell Horne AuthorDate: 2022-10-20 14:56:01 +0000 Commit: Mitchell Horne CommitDate: 2022-10-28 14:10:37 +0000 kldxref: handle R_RISCV_64 relocation These are emitted in at least two kmods, and kldxref prints a warning. While here, remove the unneeded local variable 'val'. Reviewed by: jrtc27, imp, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37038 (cherry picked from commit fc4c39c54fc240af424ae249b75057d2977ef8f2) --- usr.sbin/kldxref/ef_riscv.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/kldxref/ef_riscv.c b/usr.sbin/kldxref/ef_riscv.c index e0caae3bd286..b94b37b3a92f 100644 --- a/usr.sbin/kldxref/ef_riscv.c +++ b/usr.sbin/kldxref/ef_riscv.c @@ -45,10 +45,10 @@ int ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase, Elf_Off dataoff, size_t len, void *dest) { - Elf_Addr *where, val; + Elf_Addr *where; const Elf_Rela *rela; Elf_Addr addend, addr; - Elf_Size rtype; + Elf_Size rtype, symidx; switch (reltype) { case EF_RELOC_RELA: @@ -57,6 +57,7 @@ ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase, dataoff); addend = rela->r_addend; rtype = ELF_R_TYPE(rela->r_info); + symidx = ELF_R_SYM(rela->r_info); break; default: return (EINVAL); @@ -66,10 +67,13 @@ ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase, return (0); switch (rtype) { + case R_RISCV_64: /* S + A */ + addr = EF_SYMADDR(ef, symidx) + addend; + *where = addr; + break; case R_RISCV_RELATIVE: /* B + A */ addr = addend + relbase; - val = addr; - *where = val; + *where = addr; break; default: warnx("unhandled relocation type %d", (int)rtype);