svn commit: r228978 - in head/sys: conf modules/drm/r128 modules/drm/radeon modules/drm/via

[Dimitry Andric]

Author: dim
Date: Fri Dec 30 01:54:45 2011
New Revision: 228978
URL: http://svn.freebsd.org/changeset/base/228978

Log:
  For several files in sys/dev/drm, disable -Wunused-value when building
  with clang.  There are several macros in these files that return values,
  and in some cases nothing is done with them, but it is completely
  harmless.  For some other files, also disable -Wconstant-conversion,
  since that triggers a false positive with the DMA_BIT_MASK() macro.
  
  MFC after:	1 week

Modified:
  head/sys/conf/files
  head/sys/conf/kern.mk
  head/sys/modules/drm/r128/Makefile
  head/sys/modules/drm/radeon/Makefile
  head/sys/modules/drm/via/Makefile

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri Dec 30 01:37:25 2011	(r228977)
+++ head/sys/conf/files	Fri Dec 30 01:54:45 2011	(r228978)
@@ -992,15 +992,18 @@ dev/drm/mga_irq.c		optional mgadrm
 dev/drm/mga_state.c		optional mgadrm \
 	compile-with "${NORMAL_C} -finline-limit=13500"
 dev/drm/mga_warp.c		optional mgadrm
-dev/drm/r128_cce.c		optional r128drm
+dev/drm/r128_cce.c		optional r128drm \
+	compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}"
 dev/drm/r128_drv.c		optional r128drm
 dev/drm/r128_irq.c		optional r128drm
 dev/drm/r128_state.c		optional r128drm \
-	compile-with "${NORMAL_C} -finline-limit=13500"
+	compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} -finline-limit=13500"
 dev/drm/r300_cmdbuf.c		optional radeondrm
 dev/drm/r600_blit.c		optional radeondrm
-dev/drm/r600_cp.c		optional radeondrm
-dev/drm/radeon_cp.c		optional radeondrm
+dev/drm/r600_cp.c		optional radeondrm \
+	compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}"
+dev/drm/radeon_cp.c		optional radeondrm \
+	compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}"
 dev/drm/radeon_cs.c		optional radeondrm
 dev/drm/radeon_drv.c		optional radeondrm
 dev/drm/radeon_irq.c		optional radeondrm

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Fri Dec 30 01:37:25 2011	(r228977)
+++ head/sys/conf/kern.mk	Fri Dec 30 01:54:45 2011	(r228978)
@@ -20,6 +20,7 @@ NO_WCONSTANT_CONVERSION=	-Wno-constant-c
 NO_WARRAY_BOUNDS=		-Wno-array-bounds
 NO_WSHIFT_COUNT_NEGATIVE=	-Wno-shift-count-negative
 NO_WSHIFT_COUNT_OVERFLOW=	-Wno-shift-count-overflow
+NO_WUNUSED_VALUE=		-Wno-unused-value
 # Several other warnings which might be useful in some cases, but not severe
 # enough to error out the whole kernel build.  Display them anyway, so there is
 # some incentive to fix them eventually.

Modified: head/sys/modules/drm/r128/Makefile
==============================================================================
--- head/sys/modules/drm/r128/Makefile	Fri Dec 30 01:37:25 2011	(r228977)
+++ head/sys/modules/drm/r128/Makefile	Fri Dec 30 01:54:45 2011	(r228978)
@@ -6,3 +6,7 @@ SRCS	= r128_cce.c r128_drv.c r128_irq.c 
 SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.r128_cce.c=		${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS.r128_state.c=	${NO_WUNUSED_VALUE}
+CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}

Modified: head/sys/modules/drm/radeon/Makefile
==============================================================================
--- head/sys/modules/drm/radeon/Makefile	Fri Dec 30 01:37:25 2011	(r228977)
+++ head/sys/modules/drm/radeon/Makefile	Fri Dec 30 01:54:45 2011	(r228978)
@@ -7,3 +7,7 @@ SRCS	= r300_cmdbuf.c r600_blit.c r600_cp
 SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.r600_cp.c=	${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS.radeon_cp.c=	${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}

Modified: head/sys/modules/drm/via/Makefile
==============================================================================
--- head/sys/modules/drm/via/Makefile	Fri Dec 30 01:37:25 2011	(r228977)
+++ head/sys/modules/drm/via/Makefile	Fri Dec 30 01:54:45 2011	(r228978)
@@ -20,3 +20,7 @@ opt_drm.h:
 	echo $(DRM_LINUX_OPT) >> opt_drm.h
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.via_dma.c=		${NO_WUNUSED_VALUE}
+CWARNFLAGS.via_dmablit.c=	${NO_WUNUSED_VALUE}
+CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}