Suppress -Wstrict-prototypes for several zlib files

Clang 15 is more strict about function definitions not matching
declarations, and zlib has a lot of these, but since it is contributed
code (and in K&R style to boot), suppress those warnings instead.

MFC after:	3 days
This commit is contained in:
Dimitry Andric 2022-07-26 20:24:58 +02:00
parent 58cd36950c
commit e83ffec3af
3 changed files with 12 additions and 3 deletions

View File

@ -4086,7 +4086,8 @@ contrib/zlib/compress.c optional crypto | geom_uzip | \
mxge | ddb_ctf | gzio | zfs | zlib \
compile-with "${NORMAL_C} -Wno-cast-qual"
contrib/zlib/crc32.c optional crypto | geom_uzip | \
mxge | ddb_ctf | gzio | zfs | zlib
mxge | ddb_ctf | gzio | zfs | zlib \
compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}"
contrib/zlib/deflate.c optional crypto | geom_uzip | \
mxge | ddb_ctf | gzio | zfs | zlib \
compile-with "${NORMAL_C} -Wno-cast-qual"
@ -4097,12 +4098,14 @@ contrib/zlib/inflate.c optional crypto | geom_uzip | \
contrib/zlib/inftrees.c optional crypto | geom_uzip | \
mxge | ddb_ctf | gzio | zfs | zlib
contrib/zlib/trees.c optional crypto | geom_uzip | \
mxge | ddb_ctf | gzio | zfs | zlib
mxge | ddb_ctf | gzio | zfs | zlib \
compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}"
contrib/zlib/uncompr.c optional crypto | geom_uzip | \
mxge | ddb_ctf | gzio | zfs | zlib \
compile-with "${NORMAL_C} -Wno-cast-qual"
contrib/zlib/zutil.c optional crypto | geom_uzip | \
mxge | ddb_ctf | gzio | zfs | zlib
mxge | ddb_ctf | gzio | zfs | zlib \
compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}"
dev/zlib/zlib_mod.c optional crypto | geom_uzip | \
mxge | ddb_ctf | gzio | zfs | zlib
dev/zlib/zcalloc.c optional crypto | geom_uzip | \

View File

@ -34,6 +34,9 @@ NO_WUNUSED_BUT_SET_VARIABLE= -Wno-unused-but-set-variable
.if ${COMPILER_VERSION} >= 140000
NO_WBITWISE_INSTEAD_OF_LOGICAL= -Wno-bitwise-instead-of-logical
.endif
.if ${COMPILER_VERSION} >= 150000
NO_WSTRICT_PROTOTYPES= -Wno-strict-prototypes
.endif
# 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.

View File

@ -21,5 +21,8 @@ SRCS+= zutil.c
CWARNFLAGS.compress.c+=-Wno-cast-qual # compress:49
CWARNFLAGS.deflate.c+=-Wno-cast-qual # deflate.c:415
CWARNFLAGS.uncompr.c+=-Wno-cast-qual # uncompr:49
CWARNFLAGS.crc32.c+=${NO_WSTRICT_PROTOTYPES} # crc32.c:586
CWARNFLAGS.trees.c+=${NO_WSTRICT_PROTOTYPES} # trees.c:232
CWARNFLAGS.zutil.c+=${NO_WSTRICT_PROTOTYPES} # zutil.c:27,32
.include <bsd.kmod.mk>