Date: Tue, 10 Sep 2013 05:49:31 +0000 (UTC) From: "David E. O'Brien" <obrien@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255440 - in head/sys: conf modules/aesni Message-ID: <201309100549.r8A5nVPw038949@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: obrien Date: Tue Sep 10 05:49:31 2013 New Revision: 255440 URL: http://svnweb.freebsd.org/changeset/base/255440 Log: Only use a clang'ism if ${CC} is clang. Reviewed by: sjg Approved by: re (kib) Modified: head/sys/conf/files.amd64 head/sys/conf/files.i386 head/sys/modules/aesni/Makefile Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Tue Sep 10 05:17:53 2013 (r255439) +++ head/sys/conf/files.amd64 Tue Sep 10 05:49:31 2013 (r255440) @@ -142,7 +142,7 @@ crypto/aesni/aeskeys_amd64.S optional ae crypto/aesni/aesni.c optional aesni 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 -maes ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse ${COMPILER_TYPE:Mclang:S/clang/-maes} ${.IMPSRC}" \ no-implicit-rule \ clean "aesni_wrap.o" crypto/blowfish/bf_enc.c optional crypto | ipsec Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Tue Sep 10 05:17:53 2013 (r255439) +++ head/sys/conf/files.i386 Tue Sep 10 05:49:31 2013 (r255440) @@ -128,7 +128,7 @@ crypto/aesni/aeskeys_i386.S optional aes crypto/aesni/aesni.c optional aesni 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 -maes ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse ${COMPILER_TYPE} ${COMPILER_TYPE:Mclang:S/clang/-maes} ${.IMPSRC}" \ no-implicit-rule \ clean "aesni_wrap.o" crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb Modified: head/sys/modules/aesni/Makefile ============================================================================== --- head/sys/modules/aesni/Makefile Tue Sep 10 05:17:53 2013 (r255439) +++ head/sys/modules/aesni/Makefile Tue Sep 10 05:49:31 2013 (r255440) @@ -12,7 +12,7 @@ OBJS+= aesni_wrap.o # Remove -nostdinc so we can get the intrinsics. aesni_wrap.o: aesni_wrap.c ${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} \ - -mmmx -msse -maes ${.IMPSRC} + -mmmx -msse ${COMPILER_TYPE:Mclang:S/clang/-maes/} ${.IMPSRC} ${CTFCONVERT_CMD} .include <bsd.kmod.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309100549.r8A5nVPw038949>