From owner-svn-src-stable-12@freebsd.org Tue Feb 18 18:13:09 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 58CAA24210B; Tue, 18 Feb 2020 18:13:09 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48MTVY1h0dz4XPL; Tue, 18 Feb 2020 18:13:09 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3387324134; Tue, 18 Feb 2020 18:13:09 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01IID92Y060338; Tue, 18 Feb 2020 18:13:09 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01IID8en060334; Tue, 18 Feb 2020 18:13:08 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202002181813.01IID8en060334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 18 Feb 2020 18:13:08 +0000 (UTC) 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 X-SVN-Group: stable-12 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable: 11/sys/conf 11/sys/modules/ce 11/sys/modules/cp 12/sys/conf 12/sys/modules/ce 12/sys/modules/cp X-SVN-Commit-Revision: 358077 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Feb 2020 18:13:09 -0000 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 -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 + +CWARNFLAGS.cpddk.c+= ${NO_WMISLEADING_INDENTATION}