Module Name: src
Committed By: nia
Date: Wed Jun 2 15:45:29 UTC 2021
Modified Files:
src/sys/conf: Makefile.kern.inc
src/sys/external/bsd/drm2/drm: files.drmkms
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/nouveau: files.nouveau
src/sys/external/bsd/drm2/radeon: files.radeon
Log Message:
drm2: build with -fwrapv, since the Linux kernel does and we don't
want to spend too much time fixing their code. silences a lot of
KUBSAN warnings.
we need to use COPTS to have per-option compiler flags. help from
Riastradh.
To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.34 -r1.35 src/sys/external/bsd/drm2/drm/files.drmkms
cvs rdiff -u -r1.40 -r1.41 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/radeon/files.radeon
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.280 src/sys/conf/Makefile.kern.inc:1.281
--- src/sys/conf/Makefile.kern.inc:1.280 Tue Apr 6 15:05:12 2021
+++ src/sys/conf/Makefile.kern.inc Wed Jun 2 15:45:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.280 2021/04/06 15:05:12 simonb Exp $
+# $NetBSD: Makefile.kern.inc,v 1.281 2021/06/02 15:45:28 nia Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -449,7 +449,7 @@ CFLAGS+= ${COPTS.${.IMPSRC:T}} ${CPUFLAG
CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
-.for _v in CFLAGS CPPFLAGS CWARNFLAGS
+.for _v in COPTS CPPFLAGS CWARNFLAGS
.for _c in ${CSRCS}
${_v}.${_c:T}+=${OPT.${_c:T}:@.o.@${${_v}.${.o.}}@}
.endfor
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.34 src/sys/external/bsd/drm2/drm/files.drmkms:1.35
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.34 Fri Feb 14 04:30:05 2020
+++ src/sys/external/bsd/drm2/drm/files.drmkms Wed Jun 2 15:45:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.34 2020/02/14 04:30:05 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.35 2021/06/02 15:45:28 nia Exp $
include "external/bsd/drm2/linux/files.drmkms_linux"
@@ -12,6 +12,10 @@ define drmkms: drmkms_linux, drmkms_i2c,
defflag opt_drmkms.h DRMKMS_DEBUG
+# This code comes from the Linux kernel, which assumes signed
+# overflow is OK.
+makeoptions drmkms "COPTS.drmkms"+="-fwrapv"
+
# Overrides first.
makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include"
makeoptions drmkms_ttm CPPFLAGS+="-I$S/external/bsd/drm2/include/drm"
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.40 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.41
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.40 Tue Apr 13 04:59:00 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Wed Jun 2 15:45:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.40 2021/04/13 04:59:00 mrg Exp $
+# $NetBSD: files.i915drmkms,v 1.41 2021/06/02 15:45:28 nia Exp $
version 20180827
@@ -9,6 +9,10 @@ attach i915drmkms at pci
device intelfb: intelfbbus, drmfb, drmfb_pci, wsemuldisplaydev
attach intelfb at intelfbbus
+# This code comes from the Linux kernel, which assumes signed
+# overflow is OK.
+makeoptions i915drmkms "COPTS.i915drmkms"+="-fwrapv"
+
makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/i915drm"
makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/i915"
Index: src/sys/external/bsd/drm2/nouveau/files.nouveau
diff -u src/sys/external/bsd/drm2/nouveau/files.nouveau:1.29 src/sys/external/bsd/drm2/nouveau/files.nouveau:1.30
--- src/sys/external/bsd/drm2/nouveau/files.nouveau:1.29 Fri Feb 14 04:30:05 2020
+++ src/sys/external/bsd/drm2/nouveau/files.nouveau Wed Jun 2 15:45:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.nouveau,v 1.29 2020/02/14 04:30:05 riastradh Exp $
+# $NetBSD: files.nouveau,v 1.30 2021/06/02 15:45:28 nia Exp $
version 20180827
@@ -16,6 +16,10 @@ file external/bsd/drm2/nouveau/nouveau_s
file external/bsd/drm2/nouveau/nouveau_vga.c nouveau
file external/bsd/drm2/nouveau/nouveaufb.c nouveaufb
+# This code comes from the Linux kernel, which assumes signed
+# overflow is OK.
+makeoptions nouveau "COPTS.nouveau"+="-fwrapv"
+
makeoptions nouveau CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/nouveau"
makeoptions nouveau CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/nouveau/include"
makeoptions nouveau CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/nouveau/include/nvkm"
Index: src/sys/external/bsd/drm2/radeon/files.radeon
diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.28 src/sys/external/bsd/drm2/radeon/files.radeon:1.29
--- src/sys/external/bsd/drm2/radeon/files.radeon:1.28 Fri Feb 14 04:30:05 2020
+++ src/sys/external/bsd/drm2/radeon/files.radeon Wed Jun 2 15:45:29 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.radeon,v 1.28 2020/02/14 04:30:05 riastradh Exp $
+# $NetBSD: files.radeon,v 1.29 2021/06/02 15:45:29 nia Exp $
version 20180827
@@ -10,6 +10,10 @@ attach radeon at pci
device radeondrmkmsfb: radeonfbbus, drmfb, drmfb_pci, wsemuldisplaydev
attach radeondrmkmsfb at radeonfbbus
+# This code comes from the Linux kernel, which assumes signed
+# overflow is OK.
+makeoptions radeon "COPTS.radeon"+="-fwrapv"
+
# Our overrides first.
makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/include/radeon"
makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/radeon"
