svn commit: r303271 - in head: share/mk sys/conf

[Ruslan Bukin]

Author: br
Date: Sun Jul 24 18:04:12 2016
New Revision: 303271
URL: https://svnweb.freebsd.org/changeset/base/303271

Log:
  Fix style.

Modified:
  head/share/mk/bsd.sys.mk
  head/sys/conf/kern.mk

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Sun Jul 24 17:07:39 2016	(r303270)
+++ head/share/mk/bsd.sys.mk	Sun Jul 24 18:04:12 2016	(r303271)
@@ -111,12 +111,30 @@ CWARNFLAGS+=	-Wno-format
 
 # GCC 5.2.0
 .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 50200
-CWARNFLAGS+=	-Wno-error=unused-function -Wno-error=enum-compare -Wno-error=logical-not-parentheses -Wno-error=bool-compare -Wno-error=uninitialized -Wno-error=array-bounds -Wno-error=clobbered -Wno-error=cast-align -Wno-error=extra -Wno-error=attributes -Wno-error=inline -Wno-error=unused-but-set-variable -Wno-error=unused-value -Wno-error=strict-aliasing -Wno-error=address
+CWARNFLAGS+=	-Wno-error=address			\
+		-Wno-error=array-bounds			\
+		-Wno-error=attributes			\
+		-Wno-error=bool-compare			\
+		-Wno-error=cast-align			\
+		-Wno-error=clobbered			\
+		-Wno-error=enum-compare			\
+		-Wno-error=extra			\
+		-Wno-error=inline			\
+		-Wno-error=logical-not-parentheses	\
+		-Wno-error=strict-aliasing		\
+		-Wno-error=uninitialized		\
+		-Wno-error=unused-but-set-variable	\
+		-Wno-error=unused-function		\
+		-Wno-error=unused-value
 .endif
 
 # GCC 6.1.0
 .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100
-CWARNFLAGS+=	-Wno-error=unused-const-variable= -Wno-error=nonnull-compare -Wno-error=shift-negative-value -Wno-error=misleading-indentation -Wno-error=tautological-compare
+CWARNFLAGS+=	-Wno-error=misleading-indentation	\
+		-Wno-error=nonnull-compare		\
+		-Wno-error=shift-negative-value		\
+		-Wno-error=tautological-compare		\
+		-Wno-error=unused-const-variable
 .endif
 
 # How to handle FreeBSD custom printf format specifiers.

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Sun Jul 24 17:07:39 2016	(r303270)
+++ head/sys/conf/kern.mk	Sun Jul 24 18:04:12 2016	(r303271)
@@ -51,7 +51,7 @@ CWARNEXTRA?=	-Wno-error=inline -Wno-erro
 		-Wno-error=cast-qual -Wno-error=sequence-point -Wno-error=attributes \
 		-Wno-error=strict-overflow -Wno-error=overflow
 .if ${COMPILER_VERSION} >= 60100
-CWARNEXTRA+=	-Wno-error=nonnull-compare -Wno-error=shift-overflow=
+CWARNEXTRA+=	-Wno-error=nonnull-compare -Wno-error=shift-overflow
 .endif
 .else
 # For gcc 4.2, eliminate the too-often-wrong warnings about uninitialized vars.