diff options
| author | obrien <obrien@FreeBSD.org> | 2013-09-10 16:50:13 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2013-09-10 16:50:13 +0000 |
| commit | 4fa8b05433c6640e45fd82186cdf2e9340b70e8d (patch) | |
| tree | c835bf090a7406f927505d68b15677e980f389ae | |
| parent | 62efb2b6ebe4e6824104ab4b17c9c0c3b62f00c5 (diff) | |
| download | FreeBSD-src-4fa8b05433c6640e45fd82186cdf2e9340b70e8d.zip FreeBSD-src-4fa8b05433c6640e45fd82186cdf2e9340b70e8d.tar.gz | |
Back out r255440. /usr/bin/gcc @r255185 (2013-09-03) can build this.
Approved by: re (kib)
| -rw-r--r-- | sys/conf/files.amd64 | 2 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 2 | ||||
| -rw-r--r-- | sys/modules/aesni/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index ad9895d..1a66aa5 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 ${COMPILER_TYPE:Mclang:S/clang/-maes} ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -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 524c420..24dac5f 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 ${COMPILER_TYPE} ${COMPILER_TYPE:Mclang:S/clang/-maes} ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -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 9e0c56f..26dbedc 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 ${COMPILER_TYPE:Mclang:S/clang/-maes/} ${.IMPSRC} + -mmmx -msse -maes ${.IMPSRC} ${CTFCONVERT_CMD} .include <bsd.kmod.mk> |
