From nobody Mon Dec 11 14:16:34 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 4SpkM65RBkz53f4T; Mon, 11 Dec 2023 14:16:34 +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 4SpkM64tlNz3YWy; Mon, 11 Dec 2023 14:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702304194; 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=YUk91oIjJXlbh5a2VBcU9N/7qt4B7aFu1VjZ/f1bNSw=; b=nWtcLhiB05Qx707Vt8vQ4a2egLE9UL49fjSw3JfKDROcTzqS46zxBHBXG+2MW4AmzrmZWA v7zRUAoGVTljbct4ZidVX1TCFdw2pCwZExUE+BnDx6cSBtkBmY7BkuEggLCIhFI2ZOF+HJ DjVdFkkuWQIb2T12ufW1m5SWSQeldl5nPQayL3MGpsMBevkTzPe0XdelyKCndx+LkUv+p2 jZcsZFfwoeueaA/I2aZsWw61v3O66Mg3XlEkffV0nV20dEzOuF4VI93sfj5e9IHwYWeu0x 7WzaHqnfubn+6H7WRA2ccaJ9t+/jGpipZHaLiAgewqqAACFtCGCycp+feh05gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702304194; a=rsa-sha256; cv=none; b=FvIYaVBmljmhzWzexXDN2qpgdkBEvtaGRi7SbLJFkIqvfg7zdgmVpQy6q1XN62Oja0NI2P zU+7xiiJi61aioonkqdZJKBzir9Wa95/gMeCwyXmU/WYF+c9QFDbgjclLZLrArcgsLUvvC y7ZWH/NAOGzcvV8lzxtRFksjPOz00r8hL/eNBgOrDFQErLInvWxFl1Y2GvBYI1AA4fdVdP MRgJDbVlSmbc37Tz4AZqTN4PPkmmPvg+gfD7Y8I0ENinKAp/C4xnjXOuvWlIi2yzNyUizB To2K5gygMrkRtgOiS/AHybTPIeo0/1mbwXerZ5k7dmrWBbGaJnkzpCzOUIyzNQ== 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=1702304194; 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=YUk91oIjJXlbh5a2VBcU9N/7qt4B7aFu1VjZ/f1bNSw=; b=f8PZAck/7gGVGxbu5DbP/LH4P40m3pDzGgQU0AtZDsv3aKCcjDoekX/WNa5NvPlG9KKaHh nnzrNV3ox5GZxew29HptjqzFBmDWrkYivYWHxAs1EfVA8itcYhQccf9h1TjsrVnjBGacrh eHn5sLM31ZD9W6rSsf4mBW+oql87vaVT31Z853hmWPszH5LvG4yNPSWwSn0SRjU5eWGIOq 4X1xMSs72GvrSF6RjExn/Tkw9h+ymPvI8r5FJiNuUtQ2rYl4ik4cUDGclNhU2mF+IYZhLG b+ygK5hBHRZfZyS3b92KNTBHvTNAiUiQeEQqAPG4fgt/DPoAD5EbCp/Z2K8BhA== 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 4SpkM63sYXzZfB; Mon, 11 Dec 2023 14:16:34 +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 3BBEGYqX071886; Mon, 11 Dec 2023 14:16:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BBEGYMM071883; Mon, 11 Dec 2023 14:16:34 GMT (envelope-from git) Date: Mon, 11 Dec 2023 14:16:34 GMT Message-Id: <202312111416.3BBEGYMM071883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 96465c789a5f - main - arm: Compile vfp.c conditionally rather than using an ifdef 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96465c789a5ff2619c5d49305517b35db9754ffb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=96465c789a5ff2619c5d49305517b35db9754ffb commit 96465c789a5ff2619c5d49305517b35db9754ffb Author: Mark Johnston AuthorDate: 2023-12-11 14:07:40 +0000 Commit: Mark Johnston CommitDate: 2023-12-11 14:07:40 +0000 arm: Compile vfp.c conditionally rather than using an ifdef No functional change intended. MFC after: 1 week --- sys/arm/arm/vfp.c | 4 ---- sys/conf/files.arm | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/arm/arm/vfp.c b/sys/arm/arm/vfp.c index 40a3491c1cf9..a4be235e1e01 100644 --- a/sys/arm/arm/vfp.c +++ b/sys/arm/arm/vfp.c @@ -28,8 +28,6 @@ * SUCH DAMAGE. */ -#include -#ifdef VFP #include #include #include @@ -524,5 +522,3 @@ is_fpu_kern_thread(u_int flags __unused) curpcb = curthread->td_pcb; return ((curpcb->pcb_fpflags & PCB_FP_KERN) != 0); } - -#endif diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 8b5674b839df..075b05e36d78 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -75,7 +75,7 @@ arm/arm/uio_machdep.c standard arm/arm/undefined.c standard arm/arm/unwind.c optional ddb | kdtrace_hooks | stack arm/arm/vm_machdep.c standard -arm/arm/vfp.c standard +arm/arm/vfp.c optional vfp cddl/dev/dtrace/arm/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}" cddl/dev/dtrace/arm/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}" cddl/dev/fbt/arm/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"