svn commit: r276606 - in head/sys: conf modules/aic7xxx/ahc/ahc_pci modules/aic7xxx/ahd modules/ath modules/bwn modules/ce modules/drm/r128 modules/drm/radeon modules/drm/via modules/drm2/i915kms m...
Warner Losh
imp at FreeBSD.org
Sat Jan 3 03:35:25 UTC 2015
Author: imp
Date: Sat Jan 3 03:35:18 2015
New Revision: 276606
URL: https://svnweb.freebsd.org/changeset/base/276606
Log:
Re-support CWARNFLAGS, lost when bsd.sys.mk was removed. Also, support
CWARNFALGS.$file centrally so we don't have to have it in all the
places. Remove a few warning flags that are no longer needed.
Also, always use -Wno-unknown-pragma to (hopefully temporarily) work
around #pragma ident in debug.h in the opensolaris code. Remove some
stale warning suppression that's no longer necessary.
Modified:
head/sys/conf/files
head/sys/conf/kern.mk
head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
head/sys/modules/aic7xxx/ahd/Makefile
head/sys/modules/ath/Makefile
head/sys/modules/bwn/Makefile
head/sys/modules/ce/Makefile
head/sys/modules/drm/r128/Makefile
head/sys/modules/drm/radeon/Makefile
head/sys/modules/drm/via/Makefile
head/sys/modules/drm2/i915kms/Makefile
head/sys/modules/dtrace/fasttrap/Makefile
head/sys/modules/ibcore/Makefile
head/sys/modules/ipfilter/Makefile
head/sys/modules/ips/Makefile
head/sys/modules/mlx4/Makefile
head/sys/modules/mpr/Makefile
head/sys/modules/mps/Makefile
head/sys/modules/nxge/Makefile
head/sys/modules/wlan/Makefile
head/sys/modules/zfs/Makefile
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/conf/files Sat Jan 3 03:35:18 2015 (r276606)
@@ -1270,17 +1270,16 @@ dev/drm/mga_irq.c optional mgadrm
dev/drm/mga_state.c optional mgadrm
dev/drm/mga_warp.c optional mgadrm
dev/drm/r128_cce.c optional r128drm \
- compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}"
+ compile-with "${NORMAL_C} ${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} ${NO_WUNUSED_VALUE}"
+dev/drm/r128_state.c optional r128drm
dev/drm/r300_cmdbuf.c optional radeondrm
dev/drm/r600_blit.c optional radeondrm
dev/drm/r600_cp.c optional radeondrm \
- compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}"
+ compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
dev/drm/radeon_cp.c optional radeondrm \
- compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}"
+ compile-with "${NORMAL_C} ${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 Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/conf/kern.mk Sat Jan 3 03:35:18 2015 (r276606)
@@ -17,12 +17,9 @@ CWARNFLAGS?= -Wall -Wredundant-decls -Wn
# a false positive.
.if ${COMPILER_TYPE} == "clang"
NO_WCONSTANT_CONVERSION= -Wno-constant-conversion
-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
NO_WSELF_ASSIGN= -Wno-self-assign
-NO_WFORMAT_SECURITY= -Wno-format-security
NO_WUNNEEDED_INTERNAL_DECL= -Wno-unneeded-internal-declaration
NO_WSOMETIMES_UNINITIALIZED= -Wno-error-sometimes-uninitialized
# Several other warnings which might be useful in some cases, but not severe
@@ -31,10 +28,7 @@ NO_WSOMETIMES_UNINITIALIZED= -Wno-error-
CWARNEXTRA?= -Wno-error-tautological-compare -Wno-error-empty-body \
-Wno-error-parentheses-equality -Wno-error-unused-function \
-Wno-error-pointer-sign -Wno-error-format -Wno-error-parentheses \
- -Wno-error-switch -Wno-error-switch \
- -Wno-error-shift-count-negative \
- -Wno-error-shift-count-overflow \
- -Wno-error-constant-conversion
+ -Wno-unknown-pragmas
.endif
.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40300
@@ -200,3 +194,6 @@ CFLAGS+= -std=iso9899:1999
.else # CSTD
CFLAGS+= -std=${CSTD}
.endif # CSTD
+
+# Pull in any CWARNFLAGS the modules have added.
+CFLAGS+= ${CWARNFLAGS} ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
==============================================================================
--- head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -13,4 +13,3 @@ CFLAGS+= -I${.CURDIR}/../../../../dev/ai
.include <bsd.kmod.mk>
CWARNFLAGS.ahc_pci.c= ${NO_WCONSTANT_CONVERSION}
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/aic7xxx/ahd/Makefile
==============================================================================
--- head/sys/modules/aic7xxx/ahd/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/aic7xxx/ahd/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -44,4 +44,3 @@ CLEANFILES= ${GENSRCS}
.include <bsd.kmod.mk>
CWARNFLAGS.ahd_pci.c= ${NO_WCONSTANT_CONVERSION}
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/ath/Makefile
==============================================================================
--- head/sys/modules/ath/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/ath/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -162,7 +162,6 @@ opt_ah.h:
CWARNFLAGS.ah_regdomain.c= ${NO_WSHIFT_COUNT_NEGATIVE} ${NO_WSHIFT_COUNT_OVERFLOW}
# XXX Work around clang warnings, until maintainer approves fix.
CWARNFLAGS.if_ath.c= ${NO_WSOMETIMES_UNINITIALIZED}
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
# AR9300 HAL build overrides, as there's still some code to tidy up
CWARNFLAGS.ar9300_eeprom.c= ${NO_WCONSTANT_CONVERSION}
Modified: head/sys/modules/bwn/Makefile
==============================================================================
--- head/sys/modules/bwn/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/bwn/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -10,4 +10,3 @@ SRCS+= device_if.h bus_if.h pci_if.h
# XXX Work around clang warning, until maintainer approves fix.
CWARNFLAGS.if_bwn.c= ${NO_WSOMETIMES_UNINITIALIZED}
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/ce/Makefile
==============================================================================
--- head/sys/modules/ce/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/ce/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -28,4 +28,3 @@ opt_ng_cronyx.h:
.include <bsd.kmod.mk>
CWARNFLAGS.tau32-ddk.c= ${NO_WCONSTANT_CONVERSION}
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/drm/r128/Makefile
==============================================================================
--- head/sys/modules/drm/r128/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/drm/r128/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -9,4 +9,3 @@ SRCS +=device_if.h bus_if.h pci_if.h opt
CWARNFLAGS.r128_cce.c= -Wno-unused ${NO_WCONSTANT_CONVERSION}
CWARNFLAGS.r128_state.c= -Wno-unused
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/drm/radeon/Makefile
==============================================================================
--- head/sys/modules/drm/radeon/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/drm/radeon/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -10,4 +10,3 @@ SRCS +=device_if.h bus_if.h pci_if.h opt
CWARNFLAGS.r600_cp.c= -Wno-unused ${NO_WCONSTANT_CONVERSION}
CWARNFLAGS.radeon_cp.c= -Wno-unused ${NO_WCONSTANT_CONVERSION}
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/drm/via/Makefile
==============================================================================
--- head/sys/modules/drm/via/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/drm/via/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -24,4 +24,3 @@ opt_drm.h:
CWARNFLAGS.via_dma.c= -Wno-unused-value
CWARNFLAGS.via_dmablit.c= -Wno-unused-value
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/drm2/i915kms/Makefile
==============================================================================
--- head/sys/modules/drm2/i915kms/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/drm2/i915kms/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -53,4 +53,3 @@ SRCS += \
CWARNFLAGS.i915_debug.c= -Wno-unused-function
CWARNFLAGS.intel_lvds.c= -Wno-unused
CWARNFLAGS.intel_tv.c= -Wno-unused
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/dtrace/fasttrap/Makefile
==============================================================================
--- head/sys/modules/dtrace/fasttrap/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/dtrace/fasttrap/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -28,5 +28,6 @@ CFLAGS+= -DSMP
.include <bsd.kmod.mk>
CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h
+
CWARNFLAGS+= -Wno-cast-qual
CWARNFLAGS+= -Wno-unused
Modified: head/sys/modules/ibcore/Makefile
==============================================================================
--- head/sys/modules/ibcore/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/ibcore/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -21,4 +21,3 @@ CFLAGS+= -DINET6 -DINET -DOFED
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
CWARNFLAGS.cm.c= -Wno-unused-function
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/ipfilter/Makefile
==============================================================================
--- head/sys/modules/ipfilter/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/ipfilter/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -31,4 +31,3 @@ CWARNFLAGS.ip_proxy.c= ${NO_WSELF_ASSIG
CWARNFLAGS.ip_scan.c= -Wno-unused
CWARNFLAGS.ip_state.c= -Wno-unused
CWARNFLAGS.ip_sync.c= -Wno-unused
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/ips/Makefile
==============================================================================
--- head/sys/modules/ips/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/ips/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -9,4 +9,3 @@ SRCS = ips.c ips_pci.c ips.h ips_disk.c
# XXX Work around clang warning, until maintainer approves fix.
CWARNFLAGS.ips.c= ${NO_WSOMETIMES_UNINITIALIZED}
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/mlx4/Makefile
==============================================================================
--- head/sys/modules/mlx4/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/mlx4/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -15,4 +15,3 @@ CFLAGS+= -Wno-cast-qual -Wno-pointer-ari
CFLAGS+= -fms-extensions
CWARNFLAGS.mcg.c= -Wno-unused
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/mpr/Makefile
==============================================================================
--- head/sys/modules/mpr/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/mpr/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -15,4 +15,3 @@ SRCS+= device_if.h bus_if.h pci_if.h
CWARNFLAGS.mpr_sas.c= ${NO_WUNNEEDED_INTERNAL_DECL}
# XXX Work around clang warning, until maintainer approves fix.
CWARNFLAGS.mpr_mapping.c= ${NO_WSOMETIMES_UNINITIALIZED}
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/mps/Makefile
==============================================================================
--- head/sys/modules/mps/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/mps/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -15,4 +15,3 @@ SRCS+= device_if.h bus_if.h pci_if.h
CWARNFLAGS.mps_sas.c= ${NO_WUNNEEDED_INTERNAL_DECL}
# XXX Work around clang warning, until maintainer approves fix.
CWARNFLAGS.mps_mapping.c= ${NO_WSOMETIMES_UNINITIALIZED}
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/nxge/Makefile
==============================================================================
--- head/sys/modules/nxge/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/nxge/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -48,4 +48,3 @@ CWARNFLAGS.xgehal-channel.c= ${NO_WSELF_
CWARNFLAGS.xgehal-fifo.c= ${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-stats.c= ${NO_WSELF_ASSIGN}
CWARNFLAGS.xgehal-mgmt.c= ${NO_WSELF_ASSIGN}
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/wlan/Makefile
==============================================================================
--- head/sys/modules/wlan/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/wlan/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -23,4 +23,3 @@ CWARNFLAGS.ieee80211_crypto.c= -Wno-unus
CWARNFLAGS.ieee80211_hostap.c= -Wno-unused-function
CWARNFLAGS.ieee80211_mesh.c= -Wno-unused-function
CWARNFLAGS.ieee80211_sta.c= -Wno-unused-function
-CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/zfs/Makefile
==============================================================================
--- head/sys/modules/zfs/Makefile Sat Jan 3 02:40:51 2015 (r276605)
+++ head/sys/modules/zfs/Makefile Sat Jan 3 03:35:18 2015 (r276606)
@@ -103,7 +103,6 @@ DEBUG_FLAGS=-g
CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h
-CWARNFLAGS+=-Wno-unknown-pragmas
CWARNFLAGS+=-Wno-missing-prototypes
CWARNFLAGS+=-Wno-undef
CWARNFLAGS+=-Wno-strict-prototypes
More information about the svn-src-all
mailing list