From nobody Thu Jan 18 22:26:22 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 4TGHQk6RyPz578f9; Thu, 18 Jan 2024 22:26:22 +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 4TGHQk4Ysnz423b; Thu, 18 Jan 2024 22:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705616782; 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=3XdozQXEKJhuZVlPvN1jfpmQmLl1yCMU+bz4/SqyLDE=; b=c+wKF5J5ePLe9sZQXa+2olD+4BhrX0ZNDGrGKZJ5EnnPt4xNlIfBHGm+JYwIiGfcMimyxA Xc/hzztX7H2cyWiXIF6OfACFVdOgcSFn2gGCyv6089Sp+BRv/lSLVV5n4GV5HmgU0aNskO UOOPbZg0aM50w/RD9jbSnldbQE8k3EOKBBethtYQdQZptlF2cSRybu1E7mQfktWSTP16wK EnNMZCe7dHPr03yfewgaSGtuXbfyGN6nGCfX/pGNr0FJvN6wkHiFsU/J7FUKjJ52vNmBJd L4WaiUkpt8uuZqztoHiMfucFhxXW2lBPt03fYUqM7xy0nY1OiFU6dH0DHOf2Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705616782; 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=3XdozQXEKJhuZVlPvN1jfpmQmLl1yCMU+bz4/SqyLDE=; b=baY5PBYaetLqq/A+59NES8ZrvwwrOQc9qNPxXDIglet9r+X5/zOoxrPcA//ezml2i0DOpm dD2Hj7R/IGWfTRkSGzVno8nqg0tZ/s4Jp47kb8w3cM5oPJThFRcL1+EheJrcH5h1dfljEk kavUZuxcaAllA6sIsxzobDDdA2fqY56aJ3hx8VDehsSrHGJVTTSYl8v6SO2Ir663hiVRFI Qfb2KCfpRWIHt1Fm6utGan8bWAid1AjL4XMdkRZ468hv+BhJEPw8EsowBbhB9KJG+HGWpG DacgM5HVgWe+jRuxfR9zGp6pDHVAB3fnyzmIUvJ164j43niYGdQHoUawJNnUVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705616782; a=rsa-sha256; cv=none; b=Co5axAPB5ARfwyfjJ0vq1EcB8jHdyWZMmO/ssH0hEUgdeC2HWJtEFomtZwWmJKiq8Y6KGx 6nwFafQP1ZnOOH8L8ozdepZ3ulQmYsCAIXHJGgwqnH7oiZTAd4rb7S/cvAjXBvOlkzAlmE JCCzaxEh3kkHdHV7JEMAI+oNj/tzgoRQnHQVnWtSnFx3/q4zs9buvQXgy+ASeLsqnsliNX qKc2qwGQHEzLMDg19v4Iyex8tQ4az5rxg6wBYwrYBRlqDl5ioOwhTScYs5WXJWpPkRS0HG J8xajFjSEhVMejwlK62e41EwyWjyY1tLHuLrxT5mxOenm6f0iyuZZaOOERajsQ== 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 4TGHQk3fTXzQ4Y; Thu, 18 Jan 2024 22:26:22 +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 40IMQM5V090229; Thu, 18 Jan 2024 22:26:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IMQMYS090226; Thu, 18 Jan 2024 22:26:22 GMT (envelope-from git) Date: Thu, 18 Jan 2024 22:26:22 GMT Message-Id: <202401182226.40IMQMYS090226@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: e33e621428c1 - stable/13 - kldxref: Fix for 32-bit powerpc 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: e33e621428c1d11dfa3b9d9253580d102dd996c3 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e33e621428c1d11dfa3b9d9253580d102dd996c3 commit e33e621428c1d11dfa3b9d9253580d102dd996c3 Author: Jessica Clarke AuthorDate: 2023-12-14 16:37:34 +0000 Commit: John Baldwin CommitDate: 2024-01-18 21:30:15 +0000 kldxref: Fix for 32-bit powerpc R_PPC_RELATIVE lost its 32-bit handling in the libelf conversion. Reported by: bapt Fixes: 0299afdff145 ("kldxref: Make use of libelf to be a portable cross tool") (cherry picked from commit d1ce87ae0ddca413b098b6be8f5d3b4da87422ef) --- usr.sbin/kldxref/ef_powerpc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/kldxref/ef_powerpc.c b/usr.sbin/kldxref/ef_powerpc.c index 068c8117e4a6..ab33e170b488 100644 --- a/usr.sbin/kldxref/ef_powerpc.c +++ b/usr.sbin/kldxref/ef_powerpc.c @@ -69,7 +69,8 @@ ef_ppc_reloc(struct elf_file *ef, const void *reldata, Elf_Type reltype, le64enc(where, val); else be64enc(where, val); - } + } else + be32enc(where, val); break; case R_PPC_ADDR32: /* word32 S + A */ val = EF_SYMADDR(ef, symidx) + addend;