[src/trunk]: src/sys add -Wno-error=int-in-bool-context or -Wno-error=implici...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f22ed15bea8b
branches:  trunk
changeset: 448503:f22ed15bea8b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Feb 04 08:18:07 2019 +0000

description:
add -Wno-error=int-in-bool-context or -Wno-error=implicit-fallthrough
for various drm files that would be best ignored or upstream fixed.
(could fix savagedrm, no one upstream is that any more.)

diffstat:

 sys/external/bsd/drm2/i915drm/files.i915drmkms |  6 +++++-
 sys/external/bsd/drm2/nouveau/files.nouveau    |  5 ++++-
 sys/external/bsd/drm2/radeon/files.radeon      |  7 ++++++-
 sys/external/bsd/drm2/ttm/files.ttm            |  4 +++-
 sys/modules/i915drmkms/Makefile                |  8 +++++++-
 sys/modules/savagedrm/Makefile                 |  6 +++++-
 6 files changed, 30 insertions(+), 6 deletions(-)

diffs (114 lines):

diff -r 4d04cc83c1dd -r f22ed15bea8b sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Mon Feb 04 08:15:51 2019 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Mon Feb 04 08:18:07 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.36 2019/01/27 05:00:48 kre Exp $
+#      $NetBSD: files.i915drmkms,v 1.37 2019/02/04 08:18:07 mrg Exp $
 
 version        20180827
 
@@ -24,6 +24,10 @@
 
 makeoptions    i915drmkms      "CWARNFLAGS.intel_sprite.c"+="${${ACTIVE_CC} == gcc:? -Wno-maybe-uninitialized :}"
 
+makeoptions    i915drmkms      "CWARNFLAGS.intel_ddi.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=implicit-fallthrough :}"
+makeoptions    i915drmkms      "CWARNFLAGS.intel_display.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=implicit-fallthrough :}"
+makeoptions    i915drmkms      "CWARNFLAGS.intel_sdvo.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=implicit-fallthrough :}"
+
 file   external/bsd/drm2/i915drm/i915_module.c         i915drmkms
 file   external/bsd/drm2/i915drm/i915_pci.c            i915drmkms
 file   external/bsd/drm2/i915drm/intel_gtt.c           i915drmkms
diff -r 4d04cc83c1dd -r f22ed15bea8b sys/external/bsd/drm2/nouveau/files.nouveau
--- a/sys/external/bsd/drm2/nouveau/files.nouveau       Mon Feb 04 08:15:51 2019 +0000
+++ b/sys/external/bsd/drm2/nouveau/files.nouveau       Mon Feb 04 08:18:07 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.nouveau,v 1.25 2019/01/27 05:03:57 kre Exp $
+#      $NetBSD: files.nouveau,v 1.26 2019/02/04 08:18:08 mrg Exp $
 
 version        20180827
 
@@ -28,6 +28,9 @@
 makeoptions    nouveau "CWARNFLAGS.nouveau"+="-Wno-missing-field-initializers"
 makeoptions    nouveau "CWARNFLAGS.nouveau"+="-Wno-shadow"
 makeoptions    nouveau "CWARNFLAGS.nouveau"+="${${ACTIVE_CC} == clang:? -Wno-error=gnu-variable-sized-type-not-at-end :}"
+makeoptions    nouveau "CWARNFLAGS.nouveau"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=implicit-fallthrough :}"
+makeoptions    nouveau "CWARNFLAGS.nouveau_nvkm_subdev_bios_timing.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=int-in-bool-context :}"
+makeoptions    nouveau "CWARNFLAGS.nouveau_nvkm_subdev_clk_gt215.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=int-in-bool-context :}"
 
 file   external/bsd/drm2/nouveau/nouveau_module.c      nouveau
 
diff -r 4d04cc83c1dd -r f22ed15bea8b sys/external/bsd/drm2/radeon/files.radeon
--- a/sys/external/bsd/drm2/radeon/files.radeon Mon Feb 04 08:15:51 2019 +0000
+++ b/sys/external/bsd/drm2/radeon/files.radeon Mon Feb 04 08:18:07 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.radeon,v 1.24 2019/01/27 05:05:37 kre Exp $
+#      $NetBSD: files.radeon,v 1.25 2019/02/04 08:18:08 mrg Exp $
 
 version        20180827
 
@@ -25,6 +25,11 @@
 
 makeoptions    radeon  "CWARNFLAGS.radeon"+="${${ACTIVE_CC} == gcc:? -Wno-maybe-uninitialized :}"
 
+#makeoptions   i915drmkms      "CWARNFLAGS.radeon_cs.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=implicit-fallthrough :}"
+makeoptions    i915drmkms      "CWARNFLAGS.radeon_evergreen_cs.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=implicit-fallthrough :}"
+makeoptions    i915drmkms      "CWARNFLAGS.radeon_r300.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=implicit-fallthrough :}"
+makeoptions    i915drmkms      "CWARNFLAGS.radeon_r420.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=implicit-fallthrough :}"
+
 file   external/bsd/drm2/radeon/radeon_module.c                radeon
 file   external/bsd/drm2/radeon/radeon_pci.c                   radeon
 
diff -r 4d04cc83c1dd -r f22ed15bea8b sys/external/bsd/drm2/ttm/files.ttm
--- a/sys/external/bsd/drm2/ttm/files.ttm       Mon Feb 04 08:15:51 2019 +0000
+++ b/sys/external/bsd/drm2/ttm/files.ttm       Mon Feb 04 08:18:07 2019 +0000
@@ -1,9 +1,11 @@
-#      $NetBSD: files.ttm,v 1.1 2014/09/14 19:06:01 riastradh Exp $
+#      $NetBSD: files.ttm,v 1.2 2019/02/04 08:18:08 mrg Exp $
 
 # TTM, the texture and tiling manager.
 
 define drmkms_ttm: drmkms
 
+makeoptions    drmkms  "CWARNFLAGS.ttm_bo.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=implicit-fallthrough :}"
+
 file   external/bsd/drm2/ttm/ttm_agp_backend.c                 drmkms_ttm
 file   external/bsd/drm2/dist/drm/ttm/ttm_memory.c             drmkms_ttm
 file   external/bsd/drm2/dist/drm/ttm/ttm_tt.c                 drmkms_ttm
diff -r 4d04cc83c1dd -r f22ed15bea8b sys/modules/i915drmkms/Makefile
--- a/sys/modules/i915drmkms/Makefile   Mon Feb 04 08:15:51 2019 +0000
+++ b/sys/modules/i915drmkms/Makefile   Mon Feb 04 08:18:07 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/08/28 03:48:38 riastradh Exp $
+# $NetBSD: Makefile,v 1.12 2019/02/04 08:18:08 mrg Exp $
 
 .include "../Makefile.inc"
 .include "../drmkms/Makefile.inc"
@@ -112,4 +112,10 @@
 SRCS+= intel_tv.c
 SRCS+= intel_uncore.c
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.intel_display.c+=        -Wno-error=implicit-fallthrough
+COPTS.intel_ddi.c+=    -Wno-error=implicit-fallthrough
+COPTS.intel_sdvo.c+=   -Wno-error=implicit-fallthrough
+.endif
+
 .include <bsd.kmodule.mk>
diff -r 4d04cc83c1dd -r f22ed15bea8b sys/modules/savagedrm/Makefile
--- a/sys/modules/savagedrm/Makefile    Mon Feb 04 08:15:51 2019 +0000
+++ b/sys/modules/savagedrm/Makefile    Mon Feb 04 08:18:07 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/08/28 16:19:08 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2019/02/04 08:18:08 mrg Exp $
 
 .include "../Makefile.inc"
 
@@ -15,4 +15,8 @@
 CPPFLAGS+=     -I${S}/external/bsd/drm/dist/bsd-core \
                -I${S}/external/bsd/drm/dist/shared-core
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.savage_state.c+= -Wno-error=implicit-fallthrough
+.endif
+
 .include <bsd.kmodule.mk>