svn commit: r358077 - in stable: 11/sys/conf 11/sys/modules/ce 11/sys/modules/cp 12/sys/conf 12/sys/modules/ce 12/sys/modules/cp

[Dimitry Andric]

Author: dim
Date: Tue Feb 18 18:13:08 2020
New Revision: 358077
URL: https://svnweb.freebsd.org/changeset/base/358077

Log:
  MFC r357874:
  
  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.

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

Changes in other areas also in this revision:
Modified:
  stable/12/sys/conf/files.i386
  stable/12/sys/conf/kern.mk
  stable/12/sys/modules/ce/Makefile
  stable/12/sys/modules/cp/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/sys/conf/files.i386
==============================================================================
--- stable/11/sys/conf/files.i386	Tue Feb 18 18:03:04 2020	(r358076)
+++ stable/11/sys/conf/files.i386	Tue Feb 18 18:13:08 2020	(r358077)
@@ -197,10 +197,11 @@ dev/bxe/57712_init_values.c     optional bxe pci
 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}"
+	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION} ${NO_WMISLEADING_INDENTATION}"
 dev/cm/if_cm_isa.c		optional cm isa
 dev/coretemp/coretemp.c		optional coretemp
-dev/cp/cpddk.c			optional cp
+dev/cp/cpddk.c			optional cp \
+	compile-with "${NORMAL_C} ${NO_WMISLEADING_INDENTATION}"
 dev/cp/if_cp.c			optional cp
 dev/cpuctl/cpuctl.c		optional cpuctl
 dev/ctau/ctau.c			optional ctau

Modified: stable/11/sys/conf/kern.mk
==============================================================================
--- stable/11/sys/conf/kern.mk	Tue Feb 18 18:03:04 2020	(r358076)
+++ stable/11/sys/conf/kern.mk	Tue Feb 18 18:13:08 2020	(r358077)
@@ -36,6 +36,9 @@ CWARNEXTRA+=	-Wno-error-shift-negative-value
 .if ${COMPILER_VERSION} >= 40000
 CWARNEXTRA+=	-Wno-error-address-of-packed-member
 .endif
+.if ${COMPILER_VERSION} >= 100000
+NO_WMISLEADING_INDENTATION=	-Wno-misleading-indentation
+.endif
 
 CLANG_NO_IAS= -no-integrated-as
 .if ${COMPILER_VERSION} < 30500

Modified: stable/11/sys/modules/ce/Makefile
==============================================================================
--- stable/11/sys/modules/ce/Makefile	Tue Feb 18 18:03:04 2020	(r358076)
+++ stable/11/sys/modules/ce/Makefile	Tue Feb 18 18:13:08 2020	(r358077)
@@ -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: stable/11/sys/modules/cp/Makefile
==============================================================================
--- stable/11/sys/modules/cp/Makefile	Tue Feb 18 18:03:04 2020	(r358076)
+++ stable/11/sys/modules/cp/Makefile	Tue Feb 18 18:13:08 2020	(r358077)
@@ -26,3 +26,5 @@ opt_ng_cronyx.h:
 .endif
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.cpddk.c+=	${NO_WMISLEADING_INDENTATION}