From nobody Mon Dec 18 02:11:41 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 4StjxT2ftGz54dWJ; Mon, 18 Dec 2023 02:11:41 +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 4StjxT234qz3Kdt; Mon, 18 Dec 2023 02:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702865501; 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=TSgnXo+5tFLJ9Yq3Oo3elhbP+d0XMPdeqb0DWsObbSs=; b=mk2L8zmcrRbWvkuzR3YP3FXCNrgULlBFE9VJ3gh+/yBWQP9zhTywGVjlHX1xRGBNTYtkLg y4taOT7QZkyGp/IU8oZKT8LZJIFgH6UjPDNY9Co9EEZY1WlknnR2m+om1mamIBBEVBvvYX sDUof+TG2Y/OHaIIa4nYwHm/nzG/+agP8NUEFHO2gZhD1uL5vUroOjNEAP7ltTOCBZpsJf GWcVuQJTIaLWC1mSSxj+CX4eML/py364zbcqO8eygCiWE76rQwgTr+jOGPmodlfzDx2mHY yckFPMk1SnmR4vZVThlK7KHjq+iVveDEyREd2XKsqhJVsdnpDAr+7uDRJsUewA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702865501; a=rsa-sha256; cv=none; b=elJSsRKCJEdODwsKKe+Vc4Ns/G+fCUMHH4fudSAtEOeAdH7m6he18CQqB4JNUYQrLus1Ag 9GCiyAtqKqgTZ6ypImd48RVrfr8nNyIfusNcujYXpzVX5pfEk6b29n7z7GroH4iishqqeN JZipUxwtMLUgzXCfqtQ+BoFOu8ZzZjfWGzewNFEXPtHFAAZ8Ljt4hVm8Jbx6oIWxRwpO27 d8Rkxusz/EgTMMzz7AbHWZ2rh8PXqpRSjR1s3+LOEzjxnKQvrMq9wEgxqlq5tIGDe/uRYL QFGzGpPy//lxGuy6jqWag8uA8I3KYLKAvrpQc9d88ofzKSQDaT+F30NTuTna+Q== 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=1702865501; 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=TSgnXo+5tFLJ9Yq3Oo3elhbP+d0XMPdeqb0DWsObbSs=; b=gbAqvIrNUtfUaOxF3YurO5GLRLYDzXPuvdrhoMq6neUTIpXz8eM6Sc7KyEw3Cm/bPd42uh FtbVAfvRm7lW6gPPNbsuEGzkbiJDvqrHQj9h+kly6E8LV9bn24Hozqe3quLXhmKPPp0rlv kUMLMaA4xS0sbe47DVIywvyXBu5qxgte+3POZpvHvEA4qAXVdbvgZE/bpUj43n+W+g2FOo 8B0admRIg7erG9CiJ/YytIKEJ8CNIdSakng5d+01cOVAdFFsT9jcFxrwYeQgaLruiWxJZn Yn5EjhReH+2CYzJmWCJsUa0wSgL5zphss9xhJD2KZyRGbQqYTb1+cJjLod1FJA== 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 4StjxT13Vwz12q2; Mon, 18 Dec 2023 02:11:41 +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 3BI2Bf32074540; Mon, 18 Dec 2023 02:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BI2BfUk074537; Mon, 18 Dec 2023 02:11:41 GMT (envelope-from git) Date: Mon, 18 Dec 2023 02:11:41 GMT Message-Id: <202312180211.3BI2BfUk074537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c976896db7a1 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c976896db7a11cd6c6682a8e5613979a717f8487 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c976896db7a11cd6c6682a8e5613979a717f8487 commit c976896db7a11cd6c6682a8e5613979a717f8487 Author: Mark Johnston AuthorDate: 2023-12-11 14:07:40 +0000 Commit: Mark Johnston CommitDate: 2023-12-18 02:07:45 +0000 arm: Compile vfp.c conditionally rather than using an ifdef No functional change intended. MFC after: 1 week (cherry picked from commit 96465c789a5ff2619c5d49305517b35db9754ffb) --- 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 344dada420c9..94a8755fd315 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}"