svn commit: r351045 - head/sys/conf
Warner Losh
imp at FreeBSD.org
Wed Aug 14 20:58:07 UTC 2019
Author: imp
Date: Wed Aug 14 20:58:06 2019
New Revision: 351045
URL: https://svnweb.freebsd.org/changeset/base/351045
Log:
Apart from one MD file, aesni is common to x86. Move it into files.x86.
Reviewed by: jhb (verbal OK on irc)
Differential Revision: https://reviews.freebsd.org/D21248
Modified:
head/sys/conf/files.amd64
head/sys/conf/files.i386
head/sys/conf/files.x86
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Wed Aug 14 20:58:01 2019 (r351044)
+++ head/sys/conf/files.amd64 Wed Aug 14 20:58:06 2019 (r351045)
@@ -145,35 +145,9 @@ cddl/contrib/opensolaris/common/atomic/amd64/opensolar
cddl/dev/dtrace/amd64/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/amd64/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
crypto/aesni/aeskeys_amd64.S optional aesni
-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} ${NO_WCAST_QUAL} ${PROF} -mmmx -msse -msse4 -maes -mpclmul ${.IMPSRC}" \
- no-implicit-rule \
- clean "aesni_ghash.o"
-aesni_ccm.o optional aesni \
- dependency "$S/crypto/aesni/aesni_ccm.c" \
- 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_ccm.o"
-aesni_wrap.o optional aesni \
- dependency "$S/crypto/aesni/aesni_wrap.c" \
- 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 | ipsec_support
crypto/des/des_enc.c optional crypto | ipsec | \
ipsec_support | netsmb
-intel_sha1.o optional aesni \
- dependency "$S/crypto/aesni/intel_sha1.c" \
- compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -msha ${.IMPSRC}" \
- no-implicit-rule \
- clean "intel_sha1.o"
-intel_sha256.o optional aesni \
- dependency "$S/crypto/aesni/intel_sha256.c" \
- compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -msha ${.IMPSRC}" \
- no-implicit-rule \
- clean "intel_sha256.o"
crypto/via/padlock.c optional padlock
crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Wed Aug 14 20:58:01 2019 (r351044)
+++ head/sys/conf/files.i386 Wed Aug 14 20:58:06 2019 (r351045)
@@ -97,33 +97,7 @@ bf_enc.o optional crypto | ipsec | ipsec_support \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
crypto/aesni/aeskeys_i386.S optional aesni
-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} ${NO_WCAST_QUAL} ${PROF} -mmmx -msse -msse4 -maes -mpclmul ${.IMPSRC}" \
- no-implicit-rule \
- clean "aesni_ghash.o"
-aesni_ccm.o optional aesni \
- dependency "$S/crypto/aesni/aesni_ccm.c" \
- 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_ccm.o"
-aesni_wrap.o optional aesni \
- dependency "$S/crypto/aesni/aesni_wrap.c" \
- 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/des/arch/i386/des_enc.S optional crypto | ipsec | ipsec_support | netsmb
-intel_sha1.o optional aesni \
- dependency "$S/crypto/aesni/intel_sha1.c" \
- compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -msha ${.IMPSRC}" \
- no-implicit-rule \
- clean "intel_sha1.o"
-intel_sha256.o optional aesni \
- dependency "$S/crypto/aesni/intel_sha256.c" \
- compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -msha ${.IMPSRC}" \
- no-implicit-rule \
- clean "intel_sha256.o"
crypto/via/padlock.c optional padlock
crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock
Modified: head/sys/conf/files.x86
==============================================================================
--- head/sys/conf/files.x86 Wed Aug 14 20:58:01 2019 (r351044)
+++ head/sys/conf/files.x86 Wed Aug 14 20:58:06 2019 (r351045)
@@ -16,6 +16,40 @@
cddl/dev/fbt/x86/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
cddl/dev/dtrace/x86/dis_tables.c optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}"
cddl/dev/dtrace/x86/instr_size.c optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}"
+#
+cddl/dev/fbt/x86/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
+cddl/dev/dtrace/x86/dis_tables.c optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}"
+cddl/dev/dtrace/x86/instr_size.c optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}"
+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} ${NO_WCAST_QUAL} ${PROF} -mmmx -msse -msse4 -maes -mpclmul ${.IMPSRC}" \
+ no-implicit-rule \
+ clean "aesni_ghash.o"
+aesni_ccm.o optional aesni \
+ dependency "$S/crypto/aesni/aesni_ccm.c" \
+ 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_ccm.o"
+aesni_wrap.o optional aesni \
+ dependency "$S/crypto/aesni/aesni_wrap.c" \
+ 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"
+intel_sha1.o optional aesni \
+ dependency "$S/crypto/aesni/intel_sha1.c" \
+ compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -msha ${.IMPSRC}" \
+ no-implicit-rule \
+ clean "intel_sha1.o"
+intel_sha256.o optional aesni \
+ dependency "$S/crypto/aesni/intel_sha256.c" \
+ compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -msha ${.IMPSRC}" \
+ no-implicit-rule \
+ clean "intel_sha256.o"
+dev/fdc/fdc.c optional fdc
+dev/fdc/fdc_acpi.c optional fdc
+dev/fdc/fdc_isa.c optional fdc isa
+dev/fdc/fdc_pccard.c optional fdc pccard
dev/fdc/fdc.c optional fdc
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
More information about the svn-src-all
mailing list