Date: Tue, 18 Feb 2020 18:13:08 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: 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 Message-ID: <202002181813.01IID8en060334@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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/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) Changes in other areas also in this revision: 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) Modified: stable/12/sys/conf/files.i386 ============================================================================== --- stable/12/sys/conf/files.i386 Tue Feb 18 18:03:04 2020 (r358076) +++ stable/12/sys/conf/files.i386 Tue Feb 18 18:13:08 2020 (r358077) @@ -189,9 +189,10 @@ 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/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/12/sys/conf/kern.mk ============================================================================== --- stable/12/sys/conf/kern.mk Tue Feb 18 18:03:04 2020 (r358076) +++ stable/12/sys/conf/kern.mk Tue Feb 18 18:13:08 2020 (r358077) @@ -38,6 +38,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 CLANG_NO_IAS= -no-integrated-as .if ${COMPILER_VERSION} < 30500 Modified: stable/12/sys/modules/ce/Makefile ============================================================================== --- stable/12/sys/modules/ce/Makefile Tue Feb 18 18:03:04 2020 (r358076) +++ stable/12/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/12/sys/modules/cp/Makefile ============================================================================== --- stable/12/sys/modules/cp/Makefile Tue Feb 18 18:03:04 2020 (r358076) +++ stable/12/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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002181813.01IID8en060334>