From nobody Mon Feb 7 19:42:26 2022 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 A1D7019B4904; Mon, 7 Feb 2022 19:42:26 +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 4JsxPG3pp7z3knB; Mon, 7 Feb 2022 19:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644262946; 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=smjxreuxLvkv5aqRf6xXMwfrEx+g7+P0YHi6Re3EC1E=; b=ZsKpgEXk+MVhAg2tq7dvwDpsB8jNRRMbTYvC8F0dAEW5SUOJ0X0GPU/UtHJ2G1OempPj84 p8w2L+Tf5SHtYYEl1brtEExlcwlGg2Oqwz9zJPmULvp/1q3bQI5GYq82x3Hkhb6xbIyVtb iB2q0brq7ZIOWlqk7Vid6ZvlHOpvMgtYzKNT10wDSmm00x1IY30ZHfGsyTg4D4sZvDXedM Xq0rJpeLiBPNUH78fN1JN8xFxPnENiaXT4wp7m0SDMgeBSRJQX5qjJuENN4EmvWlBLyjzP qAEMfP8lfJUdyF3XHPun1lJbGee/Hy0CXqSQy0hxZhj1leiHvhTDqFIIZwlLWA== 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 628EE3C03; Mon, 7 Feb 2022 19:42:26 +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 217JgQVN056131; Mon, 7 Feb 2022 19:42:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217JgQF2056130; Mon, 7 Feb 2022 19:42:26 GMT (envelope-from git) Date: Mon, 7 Feb 2022 19:42:26 GMT Message-Id: <202202071942.217JgQF2056130@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alfredo Dal'Ava Junior" Subject: git: 04d4de5e609a - stable/13 - kldxref: add R_PPC64_ADDR64 handler 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: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 04d4de5e609ab32892c68882db7e9b0f2cc1935d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644262946; 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=smjxreuxLvkv5aqRf6xXMwfrEx+g7+P0YHi6Re3EC1E=; b=aerWpvMd4w3TAW2sx7hxjlKN3N7jfV57+gebV9AZPkeXGZBXQwQAopqEtN7F5Ov0Sx4Htq HDKZKZO8/rb8wG++V15EASGf77l1mDwx8ZmuEuONWgWQjhePG93HraldHFrpuBvDBqHM0G enU+8fUTeCUDVXuEp+tGF1F9IPJdM0O/v0XKAkv/VwAHKZxZJ8KhGpvjWMJj+J9FNubffC m4ftM58ErhSn4f34PiwQ9xD4D+bFBHhEaEjrY/WhhPFPrbRbyytgeM5k8F8Q21p4Y5DMHr NCMzr1rCRu+gqy4n0rHSUH7KEz+L1Bznxi2/AcoI21YNk5n+DBKIBdSpoWiocg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644262946; a=rsa-sha256; cv=none; b=TgKKDwCMJ7UtqDHionVcCN5+6DVL6jdykMbHpnnQ6PAqzftr79mx1q35oj4S0Svm6sAUg8 YTLHGwgZtknqnRTeiF7r5b4Fp1mRfAFl1FCVq5wmWd38F0yAUpf4+da7CQUaSq8cjTMOml k0SD0WR6Itl75WF/HZ8FHCFG1vcZyOp85+cPJTaH1pvQ/gdHDkXfkDXCMcysoqood5d7dN zQgrCijoytMBVcg925v8b1L6P4GV5SJoRac4qrH//VzRb5xRarEMBzOTnsKSCSZQYRvixc W4LD8gjf1tjuhplsILNKKMsOW0kacQ1qiOOl+jWyMrWXUFyW/BpzzfpIXTD+ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=04d4de5e609ab32892c68882db7e9b0f2cc1935d commit 04d4de5e609ab32892c68882db7e9b0f2cc1935d Author: Alfredo Dal'Ava Junior AuthorDate: 2021-12-27 18:29:50 +0000 Commit: Alfredo Dal'Ava Junior CommitDate: 2022-02-07 22:42:16 +0000 kldxref: add R_PPC64_ADDR64 handler Implements R_PPC64_ADDR64 handler for kldxref, addressing "kldxref: unhandled relocation type 38" when running "kldxref /boot/kernel" Reviewed by: jhibbits MFC after: 1 week Sponsored by: Instituto de Pesquisas Eldorado (eldorado.org.br) Differential Revision: https://reviews.freebsd.org/D33615 (cherry picked from commit c3d9c63329a8b70a0a3b139c7819ace13aab6716) --- usr.sbin/kldxref/ef_powerpc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.sbin/kldxref/ef_powerpc.c b/usr.sbin/kldxref/ef_powerpc.c index 4bb2792e0ecf..c50f518f892e 100644 --- a/usr.sbin/kldxref/ef_powerpc.c +++ b/usr.sbin/kldxref/ef_powerpc.c @@ -55,7 +55,7 @@ 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, addend; - Elf_Size rtype; + Elf_Size rtype, symidx; const Elf_Rela *rela; if (reltype != EF_RELOC_RELA) @@ -65,6 +65,7 @@ ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase, where = (Elf_Addr *) ((Elf_Off)dest - dataoff + rela->r_offset); addend = rela->r_addend; rtype = ELF_R_TYPE(rela->r_info); + symidx = ELF_R_SYM(rela->r_info); if ((char *)where < (char *)dest || (char *)where >= (char *)dest + len) return (0); @@ -73,6 +74,9 @@ ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase, case R_PPC_RELATIVE: /* word32|doubleword64 B + A */ *where = relbase + addend; break; + case R_PPC64_ADDR64: /* S + A */ + *where = EF_SYMADDR(ef, symidx) + addend; + break; default: warnx("unhandled relocation type %" PRI_ELF_SIZE, rtype); }