svn commit: r277940 - in head/sys: conf modules/aesni

[Dimitry Andric]

Author: dim
Date: Fri Jan 30 18:17:17 2015
New Revision: 277940
URL: https://svnweb.freebsd.org/changeset/base/277940

Log:
  For clang, disable -Wcast-qual warnings for specific aesni files, since
  clang 3.6.0 will emit a number of such warnings for those files, and
  they are partially contributed code.

Modified:
  head/sys/conf/files.amd64
  head/sys/conf/kern.mk
  head/sys/modules/aesni/Makefile

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Fri Jan 30 18:07:46 2015	(r277939)
+++ head/sys/conf/files.amd64	Fri Jan 30 18:17:17 2015	(r277940)
@@ -131,12 +131,12 @@ crypto/aesni/aeskeys_amd64.S	optional ae
 crypto/aesni/aesni.c		optional aesni
 aesni_ghash.o			optional aesni				\
 	dependency	"$S/crypto/aesni/aesni_ghash.c"			\
-	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -maes -mpclmul ${.IMPSRC}" \
+	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${NO_WCAST_QUAL} ${PROF} -mmmx -msse -msse4 -maes -mpclmul ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"aesni_ghash.o"
 aesni_wrap.o			optional aesni				\
 	dependency	"$S/crypto/aesni/aesni_wrap.c"			\
-	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -maes ${.IMPSRC}" \
+	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${NO_WCAST_QUAL} ${PROF} -mmmx -msse -msse4 -maes ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"aesni_wrap.o"
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Fri Jan 30 18:07:46 2015	(r277939)
+++ head/sys/conf/kern.mk	Fri Jan 30 18:17:17 2015	(r277940)
@@ -23,6 +23,7 @@ NO_WSHIFT_COUNT_OVERFLOW=	-Wno-shift-cou
 NO_WSELF_ASSIGN=		-Wno-self-assign
 NO_WUNNEEDED_INTERNAL_DECL=	-Wno-unneeded-internal-declaration
 NO_WSOMETIMES_UNINITIALIZED=	-Wno-error-sometimes-uninitialized
+NO_WCAST_QUAL=			-Wno-cast-qual
 # 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.

Modified: head/sys/modules/aesni/Makefile
==============================================================================
--- head/sys/modules/aesni/Makefile	Fri Jan 30 18:07:46 2015	(r277939)
+++ head/sys/modules/aesni/Makefile	Fri Jan 30 18:17:17 2015	(r277940)
@@ -22,3 +22,6 @@ aesni_wrap.o: aesni_wrap.c
 	${CTFCONVERT_CMD}
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.aesni_ghash.c=	${NO_WCAST_QUAL}
+CWARNFLAGS.aesni_wrap.c=	${NO_WCAST_QUAL}