From 4906cdc8c5d161f74ab36bb5792ac0706d182c11 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sat, 3 Jan 2015 03:35:18 +0000 Subject: [PATCH] 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. --- sys/conf/files | 9 ++++----- sys/conf/kern.mk | 11 ++++------- sys/modules/aic7xxx/ahc/ahc_pci/Makefile | 1 - sys/modules/aic7xxx/ahd/Makefile | 1 - sys/modules/ath/Makefile | 1 - sys/modules/bwn/Makefile | 1 - sys/modules/ce/Makefile | 1 - sys/modules/drm/r128/Makefile | 1 - sys/modules/drm/radeon/Makefile | 1 - sys/modules/drm/via/Makefile | 1 - sys/modules/drm2/i915kms/Makefile | 1 - sys/modules/dtrace/fasttrap/Makefile | 1 + sys/modules/ibcore/Makefile | 1 - sys/modules/ipfilter/Makefile | 1 - sys/modules/ips/Makefile | 1 - sys/modules/mlx4/Makefile | 1 - sys/modules/mpr/Makefile | 1 - sys/modules/mps/Makefile | 1 - sys/modules/nxge/Makefile | 1 - sys/modules/wlan/Makefile | 1 - sys/modules/zfs/Makefile | 1 - 21 files changed, 9 insertions(+), 30 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 24e07d96533..4eb859bab44 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -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 diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 9cb8e95ad2f..8923687095b 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -17,12 +17,9 @@ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ # 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-sometimes-uninitialized 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}} diff --git a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile index 6535d2e9d72..729b566d399 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 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 0b900e9c0de..455d002a86b 100644 --- a/sys/modules/aic7xxx/ahd/Makefile +++ b/sys/modules/aic7xxx/ahd/Makefile @@ -44,4 +44,3 @@ CLEANFILES= ${GENSRCS} .include CWARNFLAGS.ahd_pci.c= ${NO_WCONSTANT_CONVERSION} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile index 33a16501a80..c5a40c95a37 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 4362387830d..e04ab0bb3b4 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 2d54680c3ab..87d06b04849 100644 --- a/sys/modules/ce/Makefile +++ b/sys/modules/ce/Makefile @@ -28,4 +28,3 @@ opt_ng_cronyx.h: .include 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 2cf90003e94..6882c3d61a8 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 88e7ccf826d..e24875ac7df 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 4b694f785c7..a419bebacc9 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 61657c61661..4b4a595d02b 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 90e1277eaaa..260e4953e3c 100644 --- a/sys/modules/dtrace/fasttrap/Makefile +++ b/sys/modules/dtrace/fasttrap/Makefile @@ -28,5 +28,6 @@ CFLAGS+= -DSMP .include 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 b667ef8565d..730aa0a8839 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 0d8fa8a0581..f89588fd327 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 d7ccd647334..0be0e2a1385 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 1087123dd53..969a806883c 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 2fb7a391c0d..426c20274d4 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 f644fe46472..bd9a52444cf 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 98119c9a9e1..b7ffc491c3b 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 7c5a4190ea3..79d61edc827 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 ad9f398e057..29f4ae095df 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