summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2013-09-10 05:49:31 +0000
committerobrien <obrien@FreeBSD.org>2013-09-10 05:49:31 +0000
commit96543c86c6fa7e82c3f4df84a1f9ad5a8a844674 (patch)
tree50c03ce29ef3be9ce65c83fbdcb050eb932b4a6d
parentd2c56781f0a45b06fec36b63c2686686ec805f31 (diff)
downloadFreeBSD-src-96543c86c6fa7e82c3f4df84a1f9ad5a8a844674.zip
FreeBSD-src-96543c86c6fa7e82c3f4df84a1f9ad5a8a844674.tar.gz
Only use a clang'ism if ${CC} is clang.
Reviewed by: sjg Approved by: re (kib)
-rw-r--r--sys/conf/files.amd642
-rw-r--r--sys/conf/files.i3862
-rw-r--r--sys/modules/aesni/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 1a66aa5..ad9895d 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -142,7 +142,7 @@ crypto/aesni/aeskeys_amd64.S optional aesni
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
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 24dac5f..524c420 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -128,7 +128,7 @@ crypto/aesni/aeskeys_i386.S optional aesni
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
diff --git a/sys/modules/aesni/Makefile b/sys/modules/aesni/Makefile
index 26dbedc..9e0c56f 100644
--- a/sys/modules/aesni/Makefile
+++ b/sys/modules/aesni/Makefile
@@ -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>
OpenPOWER on IntegriCloud