Module Name: src
Committed By: mrg
Date: Mon Feb 4 08:18:08 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/nouveau: files.nouveau
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/external/bsd/drm2/ttm: files.ttm
src/sys/modules/i915drmkms: Makefile
src/sys/modules/savagedrm: Makefile
Log Message:
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.)
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/ttm/files.ttm
cvs rdiff -u -r1.11 -r1.12 src/sys/modules/i915drmkms/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/savagedrm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.36 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.37
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.36 Sun Jan 27 05:00:48 2019
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Mon Feb 4 08:18:07 2019
@@ -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.i91
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
Index: src/sys/external/bsd/drm2/nouveau/files.nouveau
diff -u src/sys/external/bsd/drm2/nouveau/files.nouveau:1.25 src/sys/external/bsd/drm2/nouveau/files.nouveau:1.26
--- src/sys/external/bsd/drm2/nouveau/files.nouveau:1.25 Sun Jan 27 05:03:57 2019
+++ src/sys/external/bsd/drm2/nouveau/files.nouveau Mon Feb 4 08:18:08 2019
@@ -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 CPPFLAGS+="-DCONFIG_
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
Index: src/sys/external/bsd/drm2/radeon/files.radeon
diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.24 src/sys/external/bsd/drm2/radeon/files.radeon:1.25
--- src/sys/external/bsd/drm2/radeon/files.radeon:1.24 Sun Jan 27 05:05:37 2019
+++ src/sys/external/bsd/drm2/radeon/files.radeon Mon Feb 4 08:18:08 2019
@@ -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"+=
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
Index: src/sys/external/bsd/drm2/ttm/files.ttm
diff -u src/sys/external/bsd/drm2/ttm/files.ttm:1.1 src/sys/external/bsd/drm2/ttm/files.ttm:1.2
--- src/sys/external/bsd/drm2/ttm/files.ttm:1.1 Sun Sep 14 19:06:01 2014
+++ src/sys/external/bsd/drm2/ttm/files.ttm Mon Feb 4 08:18:08 2019
@@ -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
Index: src/sys/modules/i915drmkms/Makefile
diff -u src/sys/modules/i915drmkms/Makefile:1.11 src/sys/modules/i915drmkms/Makefile:1.12
--- src/sys/modules/i915drmkms/Makefile:1.11 Tue Aug 28 03:48:38 2018
+++ src/sys/modules/i915drmkms/Makefile Mon Feb 4 08:18:08 2019
@@ -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_sprite.c
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>
Index: src/sys/modules/savagedrm/Makefile
diff -u src/sys/modules/savagedrm/Makefile:1.1 src/sys/modules/savagedrm/Makefile:1.2
--- src/sys/modules/savagedrm/Makefile:1.1 Sun Aug 28 16:19:08 2011
+++ src/sys/modules/savagedrm/Makefile Mon Feb 4 08:18:08 2019
@@ -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 @@ SRCS+= savage_state.c
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>
