From nobody Tue Nov 28 11:40:47 2023 X-Original-To: dev-commits-src-branches@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 4SfgWN0vtBz531JW; Tue, 28 Nov 2023 11:40:48 +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 4SfgWN0LfVz3Lb1; Tue, 28 Nov 2023 11:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171648; 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=2txY6CDNzzAY3IwdxkWf34mfmRx4R5CwaykySzR3TKI=; b=AFxNa+CgTiiQWkKGHEW5sI5DdwCklr+8bWCmentG6Bz8UTpIT9jyyNK+1jCHm5lu/DRP8X rnFUqsa6Ob888LHMgyOaQAitz6/1FCY0OmkYXIfCBDNlhyCcCSfFl5PWLVjWJ3B57Ks+hd Tec0AAkXMdDoVodxexFDW7InvKNZguAqhIyWpkvq/Wx/rNSNkZc37/CRYBZQdSOUOCQpKE ejgq2yN7JMHpnMgLbUeFZNrNyHh91AlbsSL8Ub4ffjDW51HMKV+vtBcNRAMFymLyoDLDxe SMdHRYb1WKA8P3fdAuIe23sjL5QG1FBdKa/tpjRe8e8uHSasROUQsWLvUgMLyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171648; 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=2txY6CDNzzAY3IwdxkWf34mfmRx4R5CwaykySzR3TKI=; b=cI0liI26nep+NUUGaKXPjN4YQO6EmBurQgiPeqXqiLYad3AEs55yYvhAQSmIQNechFSMQV soy8puku32deqI/xQAhVt7rOifus8PDSfyYkUmdaNeBdASBmkxAz3Ie4OGW00FhDD7EVKz pzM2/0ESfM+9/Hu4ubj4SPKUBt73VBnBtedPKD4OtgZaRv/mZBU/VLwhU6usix7dOiJQNU kdWr7VMBfT1ifxy94P9jMIdCMkgydcy+igQD/mFzRxWLPct0bJ5FSGaqgpVaUwFKecPiA6 BxBUpaSGLqL0rbf+mlBxOMaefUDqlb9P9p2m96DGbU1wzhSnJovOniSZevzWBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171648; a=rsa-sha256; cv=none; b=HB00vhykQb1uPt4jpLQ7/Hb+M694F5kA3IDcVMUHseMNzOU02Webam/UsRwiSpjmtpFwXi O0XjnO78Zs0PZSBFlIz+qCNr9HuP4Fv9467yOHe3EoH3DSctSed5TZK7sRFQeAjCUZttsC /AV3jNPshFQ1/6FaP6PkxG9nacjAr01KmXDsbe7QMRTf5r0kKdiFq3Io1hWXy2ZVOTG1mQ AT5864xBYZ/1u9gb6rtEGVphtcxwd2khep5W/fVe5gbCzDmwjACu3RyM4LAgZkQ1NX+rLO XR4VlnWJ1bBBJHloD9ppy6ZnZ5x/8MZSJy32XSVkgs8LvIGNIIKPWWFm670kJA== 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 4SfgWM6XDhz52P; Tue, 28 Nov 2023 11:40:47 +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 3ASBelFP033038; Tue, 28 Nov 2023 11:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBel9W033035; Tue, 28 Nov 2023 11:40:47 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:47 GMT Message-Id: <202311281140.3ASBel9W033035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 608e56cfe934 - stable/14 - FEATURE compat_freebsd_32bit: only report on arm64 when support is present List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 608e56cfe93478ff4d6e544b99ef027b98066ae5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=608e56cfe93478ff4d6e544b99ef027b98066ae5 commit 608e56cfe93478ff4d6e544b99ef027b98066ae5 Author: Konstantin Belousov AuthorDate: 2023-11-16 21:06:36 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:39:38 +0000 FEATURE compat_freebsd_32bit: only report on arm64 when support is present (cherry picked from commit 5a2bbacea56f40e91c5371d5d6a210afd797fd3b) --- sys/arm64/arm64/elf32_machdep.c | 2 ++ sys/compat/freebsd32/freebsd32_misc.c | 13 ++++++++++++- sys/compat/freebsd32/freebsd32_util.h | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index 4acb68b09108..de0ee9607ad1 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -160,6 +160,8 @@ register_elf32_brand(void *arg) if (ID_AA64PFR0_EL0_VAL(READ_SPECIALREG(id_aa64pfr0_el1)) == ID_AA64PFR0_EL0_64_32) { elf32_insert_brand_entry(&freebsd32_brand_info); + } else { + compat_freebsd_32bit = 0; } } SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST, register_elf32_brand, NULL); diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index c26e7b97e717..d9266f57ac94 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -123,7 +123,18 @@ #include #include -FEATURE(compat_freebsd_32bit, "Compatible with 32-bit FreeBSD"); +int compat_freebsd_32bit = 1; + +static void +register_compat32_feature(void *arg) +{ + if (!compat_freebsd_32bit) + return; + + FEATURE_ADD("compat_freebsd_32bit", "Compatible with 32-bit FreeBSD"); +} +SYSINIT(freebsd32, SI_SUB_EXEC, SI_ORDER_ANY, register_compat32_feature, + NULL); struct ptrace_io_desc32 { int piod_op; diff --git a/sys/compat/freebsd32/freebsd32_util.h b/sys/compat/freebsd32/freebsd32_util.h index 67f0c099792a..c32c7a2ef4c1 100644 --- a/sys/compat/freebsd32/freebsd32_util.h +++ b/sys/compat/freebsd32/freebsd32_util.h @@ -122,4 +122,6 @@ struct image_args; int freebsd32_exec_copyin_args(struct image_args *args, const char *fname, enum uio_seg segflg, uint32_t *argv, uint32_t *envv); +extern int compat_freebsd_32bit; + #endif /* !_COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ */