From nobody Tue Nov 28 11:40:48 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 4SfgWP305Jz5317M; Tue, 28 Nov 2023 11:40:49 +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 4SfgWP1QXcz3Ldr; Tue, 28 Nov 2023 11:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171649; 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=ARfeg7Ljwih91cG8cV4npnKkNmb4KGbzBLEUhmR8p9w=; b=TxGqds+ITMaFaNnJvk6jmEE1RBIgT4OGO4qRFL3sCaiLR3w4yQhZyUNkrs+UHlF83M+8mv DZ4dPf4/r04KFQNYzUPdyOkJO70jgelQUWxlEsWoHwCPD5ncF9fU5yRGNMRtuLiOreLGbQ n0q/bbFiHXwjPS8gvfFQbVzEu030KcOpfSk39lyTbtTC/q4fJFNkOM3xGFWWSJEPFao/+n OpnXSX7m9DJxEvWP14pahIJ5oQsPArRik8DFoRNo8oubALLnMyuIcqRNl/kQQdQP9ReQuy ctrXFR3u53tLJcn3v6FzKRmrj0++SnoWZBtTVYaZ+SnO04Uob9WyOs2qa69TcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171649; 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=ARfeg7Ljwih91cG8cV4npnKkNmb4KGbzBLEUhmR8p9w=; b=xkiN1t2MUO34wJntgXMY4O/poAiiT6rpoLcd5m5JoiMdB02NI+rnZqc/gI/0BvfI+xEoix aeIIUVMufZkIQGKlj7uuLnGFgYH0fLr0ZuYkN42CZ3eYCOWKUBReeBUW/TNxkPvCPH+lmR 1SuW99plCYOGMBONFWYmUvzHDvBNR+biK2qs20dqs8Qm7+18u40vJPTE/z7SvgxYEWzz42 oWn07WjsAJRRQNAzvREXesW5P/4sb2tlB7Us1T79oBeLGr+QpQlfDI6MuXYiX4f3Xz2AHg ljlgdI83liAnfd4ZwS6uA9FQ47hrvcOIbzOBwu8rCXJVoL1A/wA82ySThX0F0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171649; a=rsa-sha256; cv=none; b=TzG5AE5tQwlJXjX7Vs8ZAx4MLm6bNyXWwRkBa8Omu05+iYje5/Biglal3iwDNWfMhpqcIq vdUs2uQN2Zh99wTERNp7LN3CdToWC4bk0tW6uc9id7SAG31X/scfLL/qaGiYO+vER+o5ih yTcrI4wbE4D3T8g3+ODCe1kJZPxFiiUpKDx8O4Y5wSIEEPHygzPOItCb/uAxtXZfFvvYRc 5mGlQuDmGXV1bUHQw2paATSgblHiVZ1tV7QNR78HUhu/+AJ5ux+kLirnYAsbt3moX1Kf4D 6qZR9F2Ap63ZfAAWp9zx/Vd0OMH00me3OO1fmkMYpV0xDluTont3LmINn/I/Yw== 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 4SfgWP0VPWz56v; Tue, 28 Nov 2023 11:40:49 +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 3ASBemPw033080; Tue, 28 Nov 2023 11:40:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBemRX033077; Tue, 28 Nov 2023 11:40:48 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:48 GMT Message-Id: <202311281140.3ASBemRX033077@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: c4a62edfe2a3 - stable/14 - sysctl kern.supported_archs: return correct value 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c4a62edfe2a333d8709efc69cb9921c1a1894bb8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c4a62edfe2a333d8709efc69cb9921c1a1894bb8 commit c4a62edfe2a333d8709efc69cb9921c1a1894bb8 Author: Konstantin Belousov AuthorDate: 2023-11-16 21:58:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:39:38 +0000 sysctl kern.supported_archs: return correct value (cherry picked from commit 26b36a64be410cacbec1a5cabec091bf7de2b251) --- sys/kern/kern_mib.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index 9094d09550ee..6c19deab1d25 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -316,16 +316,25 @@ SYSCTL_PROC(_hw, HW_MACHINE_ARCH, machine_arch, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_CAPRD | CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_machine_arch, "A", "System architecture"); -#ifndef MACHINE_ARCHES #ifdef COMPAT_FREEBSD32 -#define MACHINE_ARCHES MACHINE_ARCH " " MACHINE_ARCH32 -#else -#define MACHINE_ARCHES MACHINE_ARCH -#endif +#include #endif -SYSCTL_STRING(_kern, OID_AUTO, supported_archs, CTLFLAG_RD | CTLFLAG_MPSAFE, - MACHINE_ARCHES, 0, "Supported architectures for binaries"); +static int +sysctl_kern_supported_archs(SYSCTL_HANDLER_ARGS) +{ + const char *supported_archs; + + supported_archs = +#ifdef COMPAT_FREEBSD32 + compat_freebsd_32bit ? MACHINE_ARCH " " MACHINE_ARCH32 : +#endif + MACHINE_ARCH; + return (SYSCTL_OUT(req, supported_archs, strlen(supported_archs) + 1)); +} +SYSCTL_PROC(_kern, OID_AUTO, supported_archs, CTLFLAG_RD | CTLFLAG_MPSAFE | + CTLFLAG_CAPRD | CTLTYPE_STRING, NULL, 0, sysctl_kern_supported_archs, "A", + "Supported architectures for binaries"); static int sysctl_hostname(SYSCTL_HANDLER_ARGS)