Author: cem
Date: Sat Apr 21 02:08:56 2018
New Revision: 332853
URL: https://svnweb.freebsd.org/changeset/base/332853
Log:
blake2: Disable warnings (not just error) for code we will not modify
Leave libb2 pristine and silence the warnings for mjg.
Modified:
head/sys/conf/files
head/sys/modules/blake2/Makefile
head/sys/modules/crypto/Makefile
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Sat Apr 21 01:42:02 2018 (r332852)
+++ head/sys/conf/files Sat Apr 21 02:08:56 2018 (r332853)
@@ -653,11 +653,11 @@ contrib/zstd/lib/decompress/zstd_decompress.c standard
contrib/zstd/lib/decompress/huf_decompress.c standard compile-with ${ZSTD_C}
# Blake 2
contrib/libb2/blake2b-ref.c optional crypto | ipsec | ipsec_support \
- compile-with "${NORMAL_C} -I$S/crypto/blake2 ${NO_WCAST_QUAL}
-DSUFFIX=_ref"
+ compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual
-DSUFFIX=_ref -Wno-unused-function"
contrib/libb2/blake2s-ref.c optional crypto | ipsec | ipsec_support \
- compile-with "${NORMAL_C} -I$S/crypto/blake2 ${NO_WCAST_QUAL}
-DSUFFIX=_ref"
+ compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual
-DSUFFIX=_ref -Wno-unused-function"
crypto/blake2/blake2-sw.c optional crypto | ipsec | ipsec_support \
- compile-with "${NORMAL_C} -I$S/crypto/blake2 ${NO_WCAST_QUAL}"
+ compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual"
crypto/blowfish/bf_ecb.c optional ipsec | ipsec_support
crypto/blowfish/bf_skey.c optional crypto | ipsec | ipsec_support
crypto/camellia/camellia.c optional crypto | ipsec | ipsec_support
Modified: head/sys/modules/blake2/Makefile
==============================================================================
--- head/sys/modules/blake2/Makefile Sat Apr 21 01:42:02 2018
(r332852)
+++ head/sys/modules/blake2/Makefile Sat Apr 21 02:08:56 2018
(r332853)
@@ -61,7 +61,7 @@ CFLAGS.blake2s-xop.c += -DSUFFIX=_xop -msse2 -mssse3 -
.for src in ${SRCS_IN}
${src:S/.c/.o/}: ${src}
${CC} -c ${CFLAGS:N-nostdinc} ${CFLAGS.${src}} ${WERROR} ${PROF} \
- -D_MM_MALLOC_H_INCLUDED ${.IMPSRC}
+ -D_MM_MALLOC_H_INCLUDED -Wno-unused-function ${.IMPSRC}
${CTFCONVERT_CMD}
${src:S/.c/.o/}: intrin.h emmintrin.h tmmintrin.h smmintrin.h immintrin.h \
@@ -86,5 +86,5 @@ WARNS ?= 6
.include <bsd.kmod.mk>
-CWARNFLAGS.blake2-dispatch.c += -Wno-error=unused-const-variable
-CWARNFLAGS += ${NO_WCAST_QUAL}
+CWARNFLAGS.blake2-dispatch.c += -Wno-unused-const-variable
+CWARNFLAGS += -Wno-cast-qual
Modified: head/sys/modules/crypto/Makefile
==============================================================================
--- head/sys/modules/crypto/Makefile Sat Apr 21 01:42:02 2018
(r332852)
+++ head/sys/modules/crypto/Makefile Sat Apr 21 02:08:56 2018
(r332853)
@@ -40,8 +40,8 @@ SRCS += blake2-sw.c
CFLAGS.blake2b-ref.c += -I${SRCTOP}/sys/crypto/blake2 -DSUFFIX=_ref
CFLAGS.blake2s-ref.c += -I${SRCTOP}/sys/crypto/blake2 -DSUFFIX=_ref
CFLAGS.blake2-sw.c += -I${SRCTOP}/sys/crypto/blake2
-CWARNFLAGS.blake2b-ref.c += ${NO_WCAST_QUAL}
-CWARNFLAGS.blake2s-ref.c += ${NO_WCAST_QUAL}
+CWARNFLAGS.blake2b-ref.c += -Wno-cast-qual
+CWARNFLAGS.blake2s-ref.c += -Wno-cast-qual
SRCS += chacha.c
SRCS += chacha-sw.c
SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
