On Sat, Jul 16, 2011 at 2:44 PM, Mathias Krause <minipli@xxxxxxxxxxxxxx> wrote: > diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile > index c04f1b7..a80be92 100644 > --- a/arch/x86/crypto/Makefile > +++ b/arch/x86/crypto/Makefile > @@ -13,6 +13,7 @@ obj-$(CONFIG_CRYPTO_AES_NI_INTEL) += aesni-intel.o > obj-$(CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL) += ghash-clmulni-intel.o > > obj-$(CONFIG_CRYPTO_CRC32C_INTEL) += crc32c-intel.o > +obj-$(CONFIG_CRYPTO_SHA1_SSSE3) += sha1-ssse3.o > > aes-i586-y := aes-i586-asm_32.o aes_glue.o > twofish-i586-y := twofish-i586-asm_32.o twofish_glue.o > @@ -25,3 +26,10 @@ salsa20-x86_64-y := salsa20-x86_64-asm_64.o salsa20_glue.o > aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o fpu.o > > ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o > + > +# enable AVX support only when $(AS) can actually assemble the instructions > +ifeq ($(call as-instr,vpxor %xmm0$(comma)%xmm1$(comma)%xmm2,yes,no),yes) > +AFLAGS_sha1_ssse3.o += -DSHA1_ENABLE_AVX_SUPPORT This should have been AFLAGS_sha1_ssse3_asm.o += -DSHA1_ENABLE_AVX_SUPPORT instead. Sorry, a missing adjustment for a "last minute file rename". I'll post a new version of the series with a wider target audience since there have been no reply so far for a week. > +CFLAGS_sha1_ssse3_glue.o += -DSHA1_ENABLE_AVX_SUPPORT > +endif > +sha1-ssse3-y := sha1_ssse3_asm.o sha1_ssse3_glue.o > diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S > new file mode 100644 > index 0000000..8fb0ba6 Thanks, Mathias -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html