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.

19 files changed, 1 insertions, 18 deletions

diff --git a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
index 6535d2e..729b566 100644
--- a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
+++ b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
@@ -13,4 +13,3 @@ CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I..
 .include <bsd.kmod.mk>
 
 CWARNFLAGS.ahc_pci.c=	${NO_WCONSTANT_CONVERSION}
-CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}
diff --git a/sys/modules/aic7xxx/ahd/Makefile b/sys/modules/aic7xxx/ahd/Makefile
index 0b900e9..455d002 100644
--- a/sys/modules/aic7xxx/ahd/Makefile
+++ b/sys/modules/aic7xxx/ahd/Makefile
@@ -44,4 +44,3 @@ CLEANFILES= ${GENSRCS}
 .include <bsd.kmod.mk>
 
 CWARNFLAGS.ahd_pci.c=	${NO_WCONSTANT_CONVERSION}
-CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}
diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile
index 33a1650..c5a40c9 100644
--- a/sys/modules/ath/Makefile
+++ b/sys/modules/ath/Makefile
@@ -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}
diff --git a/sys/modules/bwn/Makefile b/sys/modules/bwn/Makefile
index 4362387..e04ab0b 100644
--- a/sys/modules/bwn/Makefile
+++ b/sys/modules/bwn/Makefile
@@ -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}}
diff --git a/sys/modules/ce/Makefile b/sys/modules/ce/Makefile
index 2d54680..87d06b0 100644
--- a/sys/modules/ce/Makefile
+++ b/sys/modules/ce/Makefile
@@ -28,4 +28,3 @@ opt_ng_cronyx.h:
 .include <bsd.kmod.mk>
 
 CWARNFLAGS.tau32-ddk.c=	${NO_WCONSTANT_CONVERSION}
-CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}
diff --git a/sys/modules/drm/r128/Makefile b/sys/modules/drm/r128/Makefile
index 2cf9000..6882c3d 100644
--- a/sys/modules/drm/r128/Makefile
+++ b/sys/modules/drm/r128/Makefile
@@ -9,4 +9,3 @@ SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h
 
 CWARNFLAGS.r128_cce.c=		-Wno-unused ${NO_WCONSTANT_CONVERSION}
 CWARNFLAGS.r128_state.c=	-Wno-unused
-CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
diff --git a/sys/modules/drm/radeon/Makefile b/sys/modules/drm/radeon/Makefile
index 88e7ccf..e24875a 100644
--- a/sys/modules/drm/radeon/Makefile
+++ b/sys/modules/drm/radeon/Makefile
@@ -10,4 +10,3 @@ SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h
 
 CWARNFLAGS.r600_cp.c=	-Wno-unused ${NO_WCONSTANT_CONVERSION}
 CWARNFLAGS.radeon_cp.c=	-Wno-unused ${NO_WCONSTANT_CONVERSION}
-CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}
diff --git a/sys/modules/drm/via/Makefile b/sys/modules/drm/via/Makefile
index 4b694f7..a419beb 100644
--- a/sys/modules/drm/via/Makefile
+++ b/sys/modules/drm/via/Makefile
@@ -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}}
diff --git a/sys/modules/drm2/i915kms/Makefile b/sys/modules/drm2/i915kms/Makefile
index 61657c6..4b4a595 100644
--- a/sys/modules/drm2/i915kms/Makefile
+++ b/sys/modules/drm2/i915kms/Makefile
@@ -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}}
diff --git a/sys/modules/dtrace/fasttrap/Makefile b/sys/modules/dtrace/fasttrap/Makefile
index 90e1277..260e495 100644
--- a/sys/modules/dtrace/fasttrap/Makefile
+++ b/sys/modules/dtrace/fasttrap/Makefile
@@ -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
diff --git a/sys/modules/ibcore/Makefile b/sys/modules/ibcore/Makefile
index b667ef8..730aa0a 100644
--- a/sys/modules/ibcore/Makefile
+++ b/sys/modules/ibcore/Makefile
@@ -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}}
diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile
index 0d8fa8a..f89588f 100644
--- a/sys/modules/ipfilter/Makefile
+++ b/sys/modules/ipfilter/Makefile
@@ -31,4 +31,3 @@ CWARNFLAGS.ip_proxy.c=		${NO_WSELF_ASSIGN} -Wno-unused
 CWARNFLAGS.ip_scan.c=		-Wno-unused
 CWARNFLAGS.ip_state.c=		-Wno-unused
 CWARNFLAGS.ip_sync.c=		-Wno-unused
-CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
diff --git a/sys/modules/ips/Makefile b/sys/modules/ips/Makefile
index d7ccd64..0be0e2a 100644
--- a/sys/modules/ips/Makefile
+++ b/sys/modules/ips/Makefile
@@ -9,4 +9,3 @@ SRCS		= ips.c ips_pci.c ips.h ips_disk.c ips_disk.h ips_commands.c \
 
 # XXX Work around clang warning, until maintainer approves fix.
 CWARNFLAGS.ips.c=	${NO_WSOMETIMES_UNINITIALIZED}
-CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}
diff --git a/sys/modules/mlx4/Makefile b/sys/modules/mlx4/Makefile
index 1087123..969a806 100644
--- a/sys/modules/mlx4/Makefile
+++ b/sys/modules/mlx4/Makefile
@@ -15,4 +15,3 @@ CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
 CFLAGS+= -fms-extensions
 
 CWARNFLAGS.mcg.c=	-Wno-unused
-CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}
diff --git a/sys/modules/mpr/Makefile b/sys/modules/mpr/Makefile
index 2fb7a391..426c202 100644
--- a/sys/modules/mpr/Makefile
+++ b/sys/modules/mpr/Makefile
@@ -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}}
diff --git a/sys/modules/mps/Makefile b/sys/modules/mps/Makefile
index f644fe4..bd9a524 100644
--- a/sys/modules/mps/Makefile
+++ b/sys/modules/mps/Makefile
@@ -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}}
diff --git a/sys/modules/nxge/Makefile b/sys/modules/nxge/Makefile
index 98119c9..b7ffc49 100644
--- a/sys/modules/nxge/Makefile
+++ b/sys/modules/nxge/Makefile
@@ -48,4 +48,3 @@ CWARNFLAGS.xgehal-channel.c=	${NO_WSELF_ASSIGN}
 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}}
diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile
index 7c5a419..79d61ed 100644
--- a/sys/modules/wlan/Makefile
+++ b/sys/modules/wlan/Makefile
@@ -23,4 +23,3 @@ CWARNFLAGS.ieee80211_crypto.c=	-Wno-unused-function
 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}}
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index ad9f398..29f4ae0 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -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