From nobody Thu Dec 14 16:44:26 2023 X-Original-To: dev-commits-src-main@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 4SrdVL4cd7z52jdm; Thu, 14 Dec 2023 16:44: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 4SrdVL3D1Kz3WtW; Thu, 14 Dec 2023 16:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702572266; 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=osltNOoweVh1AEfDgioYBPi+fVu0ZjiX4RDG1mJnNI8=; b=WqLkVIuUsDRmeIbk949qT+KRejwHgU0ObKNN180x4e6ATK5Jx/5uwOtUGZwmo+685hKZtM 2f0QPsJ39FRmaIVPZr/xAMkbK3EG8FAFNkkz/DMMP5E94KEM5C8yNMKztb8w0ERQ1XKvpq tB23MsT9a/yMHTQVKzCD+n/MvOQmuU2g4w/eOVm3Dn85Da7KnoFAV0FvzB8hVccJ32YLjn WAbyW4meN4UusDTCiVWAVHJC0cYvciMOyW4OUmxRgsjBQYo5GjkG74qjZNGd72C/bnaYbB QXXqpDfihLxL5gku7+HSjX4mM479DsF9fLSovNSeIJhQHcNTNbn5fvXfMr3wvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702572266; a=rsa-sha256; cv=none; b=hsmg4NGhtwgkV4VeIzkZNY0NLw6laqUxlRDauQ68nuuY7h/yAfKxcyG2INoZeB5dy6gtBH dY/cWe/FPdVSfSbWntzJgx0ELVn82l7S/N6UFc214F1GAaxahilT53St7Mi/0Z8/lSzWPM jBTjegdajDsyLGad5Y7rU7baIwk2OvsDWzZ0L8+5rAMhyyujkpQPE7k6N1ZLCsH532Qetc kkioSewVrpm82Gpb40t4e+boyQMi1TW9E7XhJnAHezMXk9PUeLaCnprX73ziiAJOcLZIkR Jv1Eo5NRkTDu0Anbp086PvHGSNRmUZ6jIx4tifWmr68iETG2kUeRNqCHSSF58w== 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=1702572266; 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=osltNOoweVh1AEfDgioYBPi+fVu0ZjiX4RDG1mJnNI8=; b=anJ3zVFjw/BpZ5XkzNKP46WClGwgMWp0yebCU7XxZsjvejsz9kRLWyq96eWt3pyWno1YKn fMRD14z/hQ1WP8Dj0bOfVXZtA1CdIMiWAv1zK6pfcUkkRzdNVvvixAWKNVTKwTtJecCd53 wy8SVmaODZCNfa4NKGGcjM2zxSB0D09a3Zn/wW524USFxFBdULlURnwdUdBoUb0Ep8ZZf2 e/uq8JTaQbOnWHlxqqNw+C68aCOqh/HFiHnURjIGPAEIS2PhXLS+ubQGBXiMtw15QSlubs 96voonPW776jt++amdIF0ZiMjcofHBnQBDNXXTxeJZWEJmoATwWPHcRFiv2dWw== 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 4SrdVL2435zbGK; Thu, 14 Dec 2023 16:44:26 +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 3BEGiQWj081500; Thu, 14 Dec 2023 16:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEGiQKZ081497; Thu, 14 Dec 2023 16:44:26 GMT (envelope-from git) Date: Thu, 14 Dec 2023 16:44:26 GMT Message-Id: <202312141644.3BEGiQKZ081497@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: 0840bdbf2a07 - main - Don't try and run kldxref for arm kernels List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0840bdbf2a07b68e29267bc49057ca6df2351360 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0840bdbf2a07b68e29267bc49057ca6df2351360 commit 0840bdbf2a07b68e29267bc49057ca6df2351360 Author: Jessica Clarke AuthorDate: 2023-12-14 16:40:08 +0000 Commit: Jessica Clarke CommitDate: 2023-12-14 16:40:08 +0000 Don't try and run kldxref for arm kernels Surprisingly, kldxref does not currently support arm, and unhelpfully this means it silently does nothing rather than give an error, so the linker.hints entry added to the METALOG for -DNO_ROOT builds (and pkgbase ones) refers to a file that doesn't exist. Ideally it would be supported (and ideally the METALOG handling would be less fragile, but without integrating it into kldxref the only real option would be to just run find(1) to get the list of linker.hints files, which feels a little backwards), but for now just paper over this by skipping the build step on arm. Reported by: bapt Fixes: ff7c12c1f17e ("Make kldxref a bootstrap tool and use unconditionally") --- sys/conf/kmod.mk | 3 ++- sys/modules/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 5d4dcd4371bc..4482034baf67 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -354,7 +354,8 @@ _kmodinstall: .PHONY .include -.if !defined(NO_XREF) +# XXX: kldxref lacks support for arm +.if !defined(NO_XREF) && ${MACHINE_CPUARCH} != "arm" afterinstall: _kldxref .ORDER: realinstall _kldxref .ORDER: _installlinks _kldxref diff --git a/sys/modules/Makefile b/sys/modules/Makefile index c14933eebda4..dc914946ff41 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -908,7 +908,8 @@ SUBDIR:= ${SUBDIR:N${reject}} .endif # MODULES_OVERRIDE -- Keep last # Calling kldxref(8) for each module is expensive. -.if !defined(NO_XREF) +# XXX: kldxref lacks support for arm +.if !defined(NO_XREF) && ${MACHINE_CPUARCH} != "arm" .MAKEFLAGS+= -DNO_XREF afterinstall: .PHONY ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}