From a8db1fa14dc3cefb6777999b5f67f79e1e3f16e6 Mon Sep 17 00:00:00 2001
From: Ruslan Bukin <br@FreeBSD.org>
Date: Mon, 4 Jun 2018 16:21:18 +0000
Subject: [PATCH] Sort GCC warning flags and remove duplicates.

Sponsored by:	DARPA, AFRL
---
 share/mk/bsd.sys.mk | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index d6fc30f95d25..6a56a554de0b 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -141,19 +141,17 @@ CWARNFLAGS+=	-Wno-error=misleading-indentation	\
 
 # GCC 7.1.0
 .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 70100
-CWARNFLAGS+=	-Wno-error=deprecated			\
-		-Wno-error=pointer-compare		\
+CWARNFLAGS+=	-Wno-error=bool-operation		\
+		-Wno-error=deprecated			\
+		-Wno-error=expansion-to-defined		\
+		-Wno-error=format-overflow		\
 		-Wno-error=format-truncation		\
 		-Wno-error=implicit-fallthrough		\
-		-Wno-error=expansion-to-defined		\
 		-Wno-error=int-in-bool-context		\
-		-Wno-error=bool-operation		\
-		-Wno-error=format-overflow		\
-		-Wno-error=stringop-overflow		\
 		-Wno-error=memset-elt-size		\
-		-Wno-error=int-in-bool-context		\
-		-Wno-error=unused-const-variable	\
-		-Wno-error=nonnull
+		-Wno-error=nonnull			\
+		-Wno-error=pointer-compare		\
+		-Wno-error=stringop-overflow
 .endif
 
 # How to handle FreeBSD custom printf format specifiers.