svn commit: r357874 - in head/sys: conf modules/ce modules/cp

[Dimitry Andric]

Author: dim
Date: Thu Feb 13 19:29:57 2020
New Revision: 357874
URL: https://svnweb.freebsd.org/changeset/base/357874

Log:
  Merge r357872 from the clang1000-import branch:
  
  Disable new clang 10.0.0 warnings about misleading indentation in ce(4)
  and cp(4).
  
  These are false positives, since some of the driver source has been
  deliberately obfuscated.
  
  MFC after:	3 days

Modified:
  head/sys/conf/files.i386
  head/sys/conf/kern.mk
  head/sys/modules/ce/Makefile
  head/sys/modules/cp/Makefile
Directory Properties:
  head/   (props changed)

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Thu Feb 13 19:28:30 2020	(r357873)
+++ head/sys/conf/files.i386	Thu Feb 13 19:29:57 2020	(r357874)
@@ -93,8 +93,9 @@ dev/agp/agp_via.c		optional agp
 dev/ce/ceddk.c			optional ce
 dev/ce/if_ce.c			optional ce
 dev/ce/tau32-ddk.c		optional ce \
-	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
-dev/cp/cpddk.c			optional cp
+	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION} ${NO_WMISLEADING_INDENTATION}"
+dev/cp/cpddk.c			optional cp \
+	compile-with "${NORMAL_C} ${NO_WMISLEADING_INDENTATION}"
 dev/cp/if_cp.c			optional cp
 dev/ctau/ctau.c			optional ctau
 dev/ctau/ctddk.c		optional ctau

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Thu Feb 13 19:28:30 2020	(r357873)
+++ head/sys/conf/kern.mk	Thu Feb 13 19:29:57 2020	(r357874)
@@ -37,6 +37,9 @@ CWARNEXTRA+=	-Wno-error-shift-negative-value
 .if ${COMPILER_VERSION} >= 40000
 CWARNEXTRA+=	-Wno-address-of-packed-member
 .endif
+.if ${COMPILER_VERSION} >= 100000
+NO_WMISLEADING_INDENTATION=	-Wno-misleading-indentation
+.endif
 .endif
 
 .if ${COMPILER_TYPE} == "gcc"

Modified: head/sys/modules/ce/Makefile
==============================================================================
--- head/sys/modules/ce/Makefile	Thu Feb 13 19:28:30 2020	(r357873)
+++ head/sys/modules/ce/Makefile	Thu Feb 13 19:29:57 2020	(r357874)
@@ -27,4 +27,5 @@ opt_ng_cronyx.h:
 
 .include <bsd.kmod.mk>
 
-CWARNFLAGS.tau32-ddk.c=	${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS.tau32-ddk.c+=	${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS.tau32-ddk.c+=	${NO_WMISLEADING_INDENTATION}

Modified: head/sys/modules/cp/Makefile
==============================================================================
--- head/sys/modules/cp/Makefile	Thu Feb 13 19:28:30 2020	(r357873)
+++ head/sys/modules/cp/Makefile	Thu Feb 13 19:29:57 2020	(r357874)
@@ -26,3 +26,5 @@ opt_ng_cronyx.h:
 .endif
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.cpddk.c+=	${NO_WMISLEADING_INDENTATION}