From nobody Thu Jan 18 22:25:51 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 4TGHQ76lgWz578Ql; Thu, 18 Jan 2024 22:25:51 +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 4TGHQ74zsRz40xl; Thu, 18 Jan 2024 22:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705616751; 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=6DLQkphLM/3gPIAfs6mBp3osYtsYldSHgo1P3cyRwxI=; b=RN1f9bCy6igfIEuLFiUuv5IxD1xcOu1luQ1a2r5AbIc4seNJKzQo93KvZDilGtmNHDfM7K wN1VXG0u0HtqNjeCH2qnSAAJD/3+9fbtzSppW7S4ahrU3Fpcrnnk2Qf4708MRLiehDgPnp aQML9TbCwlUw/wjTRRixEfdCI+BaSh5DxAvetQL1K2sCRvgThmv9s/YIrMV1Jcwej60Ld0 R7HSIIeCyv89OPGRuKOdukHueoHolQEUYcRP7b7PiWSjSaRNw9kKONpPWzN65NIpCBNa3C j8j75k0CeK2EkyOyB0onqCyR5Q1/IUcivydX0ZJ2kh7qt45iIdREz/CRYypU8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705616751; 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=6DLQkphLM/3gPIAfs6mBp3osYtsYldSHgo1P3cyRwxI=; b=OsbE9T5wAygRg6JH4SrIEoVmsn+k+EcG85lU9Q3JlJ2U7H2jhPjqj5nl3wRwFo1CM8KfNR GCUOqoiH9mYPxTE4Z5SaN7qM4EIq+Ywiuh4Qq2cy+gyV0F6MyCyopjyhBc4HTo0J2PeNur jKkCLA5+Mv7f66nOz62dzsBPKABRwpg4vWxorz6tOwSTJIRnJUjnW5AJp7+5PsSXxKpjJe Yts9vU583pNU0jWLRYb3EQpo3AmVCutdwJLYMkMZ+oqshF4xQXMNsMlmiQVAfobwkaccDo OOhvPhZ5sCo6msSg6A2Esz5EAJd5/HrYmDValAXL8fqm8s4fOUrSNRRnzeegQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705616751; a=rsa-sha256; cv=none; b=Sh4iiRWo8eY1AZvCiz+msgPtbMNjZiZxrKZOHjUHOf7MfrwhttPx16Qlj86+uDmel978+r TWY5VQJfES1xBGMJXP1qsgXEoWIVtKea2TOO6AZXmrHkdY3LGJl0+XCnlukNOGDndD9BXA clDk851JwnEF6aOGLUdu3K+cYYD3F9i9VV+hIPJXNu10h4aeHJ6h70en1fiuvT50r5V19K FATlikO71+iD89q5JYLEUYjS8mUjJeNGgDbRfu6XFP2CcZJWiJYOIhNkYu4y4Z05zWXwqR uJHljbcJ6qk/6r0ejW3ZzNlGgkXK24TficWMatyx8DEnaimLS1wtLzbz1ZxJkg== 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 4TGHQ72dRyzQHs; Thu, 18 Jan 2024 22:25:51 +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 40IMPpIS089095; Thu, 18 Jan 2024 22:25:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IMPpPF089092; Thu, 18 Jan 2024 22:25:51 GMT (envelope-from git) Date: Thu, 18 Jan 2024 22:25:51 GMT Message-Id: <202401182225.40IMPpPF089092@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: cf0810ba2506 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: cf0810ba25061962ba5f5e4012e7b089ed936fc0 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cf0810ba25061962ba5f5e4012e7b089ed936fc0 commit cf0810ba25061962ba5f5e4012e7b089ed936fc0 Author: Jessica Clarke AuthorDate: 2023-12-14 16:37:34 +0000 Commit: John Baldwin CommitDate: 2024-01-18 21:30:13 +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;