From 7aab8fc5c5f0f26e494be3bc05c58cf38687cf69 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 25 Apr 2023 14:09:21 -0700
Subject: [PATCH] clang: Enable -Wdeprecated-non-prototype by default.

PR:		270919 (exp-run)
Reviewed by:	dim, emaste
Differential Revision:	https://reviews.freebsd.org/D39535
---
 share/mk/bsd.sys.mk | 1 -
 sys/conf/kern.mk    | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 19f92d8f9d5d..8141ed0661d1 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -95,7 +95,6 @@ CWARNFLAGS.clang+=	-Wno-unused-const-variable
 CWARNFLAGS.clang+=	-Wno-error=unused-but-set-variable
 .endif
 .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000
-CWARNFLAGS.clang+=	-Wno-error=deprecated-non-prototype
 CWARNFLAGS.clang+=	-Wno-error=unused-but-set-parameter
 .endif
 .endif # WARNS <= 6
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 06fb48d0f93f..1a1251f670e1 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -47,10 +47,9 @@ CWARNEXTRA?=	-Wno-error=tautological-compare -Wno-error=empty-body \
 CWARNEXTRA+=	-Wno-error=shift-negative-value
 CWARNEXTRA+=	-Wno-address-of-packed-member
 .if ${COMPILER_VERSION} >= 150000
-# Clang 15 has much more aggressive diagnostics about K&R prototypes,
-# mismatched prototypes, and unused-but-set variables. Make these
+# Clang 15 has much more aggressive diagnostics about
+# mismatched prototypes and unused-but-set variables. Make these
 # non-fatal for the time being.
-CWARNEXTRA+=	-Wno-error=deprecated-non-prototype
 CWARNEXTRA+=	-Wno-error=strict-prototypes
 CWARNEXTRA+=	-Wno-error=unused-but-set-variable
 .endif