From nobody Thu Dec 14 16:44:25 2023 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 4SrdVK2nynz52jgf; Thu, 14 Dec 2023 16:44:25 +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 4SrdVK2FGRz3Wcx; Thu, 14 Dec 2023 16:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702572265; 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=VffTHOvYee6E5XVCKSMX04sQOy3ih3Zz0e2hualaPXk=; b=NE+NAdooaEkbBWyoOn8a2v8mflX/vPxWpD+zgTXGWETB5h8g2MGzJDb15EI8tzLeY/bBif qoLRb3BKTZFGQNTmYQrcII/YxFnlQV81+oh73J654DdQm4zfa+NQHrtTOvEBjtL9dA+Hbv WYun3eBHz6cOz15CcKwgNR7PKeR88Ez44lO6mJWHV12k+XDkTj7mCLHzeotladyhi3+M8X 8dMDkdn6swDAwfp8WOZ0K+PAYnD+Lie5e95pmsGeKxeTZOdMfKbwbZXUvChFWGHzozGume 7nq5oEJkB+NSkRgYJ5VKA1f8/RWleQVTztEvdwH3cFX2/4cjA3mG6VlA2woG4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702572265; a=rsa-sha256; cv=none; b=krT0re+n51PtNqx7Kze/JpTRwW3ig8EN+MHKL0N5wzGtYx24LZfKVKXSouqrLqPJW3qfgq ClFk8d26feWZYNEPrjZMoj+IUyzZMEG3m3uUzHmlUNs6XHL4GNsu/C+z5mTE4+GjMXzW+T bm04ayM2Qy7znIiKxcDPckD0i8LWeJ3caMmfyfizjtLHxwcFFiFuveKZBJgBfJZRLSlS3H 3Czwmqcwkij2me1ow763cuUWrjuJs4RqJ4gGVewh+CRhQxCdqHExqzrunYTvTmqT5CPrlB koaTT42PporeylS37d0yhbgr8nJAYzEJKktf/F3Ud0G7MUZzo227w6J8YMRncQ== 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=1702572265; 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=VffTHOvYee6E5XVCKSMX04sQOy3ih3Zz0e2hualaPXk=; b=Jt8xkaxfcZX7l/tZjen2s1Z7t31HYJy+1841V/O12+n/lwFIE/7M9BkNsOMMDlpK+XerI6 Af3ItfCveOU5l6bM/5joMOO327ZRa5mkBWSfO/uYLhL7P/gXQbP1yeRZGr2jgMm0yDPtdB 64CUjxvZ5H5iYG2mc6eUYwSA+/Ru32eBJlIC4BOjzWUGGayzk8TtHMkBTCpv2BIrPaeTe+ r6LmJjMBEZLWnhncAobkf50NJ4X4ufZ4ekPAM0xERwwVqhHmbVIzBId8jv4839FcIK2+Bz 2SjKeUU9UokhUzzeM3dp7ptZqFDTIZbslV6HcVUI4vco9ykcM/59fWucam4LVA== 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 4SrdVK1Jg0zbHy; Thu, 14 Dec 2023 16:44:25 +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 3BEGiPQ6081449; Thu, 14 Dec 2023 16:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEGiPoU081446; Thu, 14 Dec 2023 16:44:25 GMT (envelope-from git) Date: Thu, 14 Dec 2023 16:44:25 GMT Message-Id: <202312141644.3BEGiPoU081446@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: d1ce87ae0ddc - main - 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1ce87ae0ddca413b098b6be8f5d3b4da87422ef Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d1ce87ae0ddca413b098b6be8f5d3b4da87422ef commit d1ce87ae0ddca413b098b6be8f5d3b4da87422ef Author: Jessica Clarke AuthorDate: 2023-12-14 16:37:34 +0000 Commit: Jessica Clarke CommitDate: 2023-12-14 16:37:34 +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") --- 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;