Add support for AMD64 processors and Microsoft Windows.

[catacomb] / symm / Makefile.am

diff --git a/symm/Makefile.am b/symm/Makefile.am
index ba037cd..e78277b 100644 (file)
--- a/symm/Makefile.am
+++ b/symm/Makefile.am
@@ -181,7 +181,10 @@ BLKCS                      += rc5
 BLKCS                  += rijndael rijndael192 rijndael256
 libsymm_la_SOURCES     += rijndael-base.h rijndael-base.c
 if CPUFAM_X86
-libsymm_la_SOURCES     += rijndael-x86-aesni.S
+libsymm_la_SOURCES     += rijndael-x86ish-aesni.S
+endif
+if CPUFAM_AMD64
+libsymm_la_SOURCES     += rijndael-x86ish-aesni.S
 endif
 libsymm_la_SOURCES     += $(precomp)/rijndael-tab.c
 PRECOMPS               += $(precomp)/rijndael-tab.c
@@ -382,7 +385,10 @@ EXTRA_DIST         += salsa20-tvconv
 pkginclude_HEADERS     += salsa20.h salsa20-core.h
 libsymm_la_SOURCES     += salsa20.c
 if CPUFAM_X86
-libsymm_la_SOURCES     += salsa20-x86-sse2.S
+libsymm_la_SOURCES     += salsa20-x86ish-sse2.S
+endif
+if CPUFAM_AMD64
+libsymm_la_SOURCES     += salsa20-x86ish-sse2.S
 endif
 TESTS                  += salsa20.$t
 ALL_CIPHERS            += salsa20 salsa2012 salsa208
@@ -411,7 +417,10 @@ t/salsa20: salsa20-tvconv t/salsa20.local $(SALSA20_ESTREAM_TV)
 pkginclude_HEADERS     += chacha.h chacha-core.h
 libsymm_la_SOURCES     += chacha.c
 if CPUFAM_X86
-libsymm_la_SOURCES     += chacha-x86-sse2.S
+libsymm_la_SOURCES     += chacha-x86ish-sse2.S
+endif
+if CPUFAM_AMD64
+libsymm_la_SOURCES     += chacha-x86ish-sse2.S
 endif
 TESTS                  += chacha.$t
 EXTRA_DIST             += t/chacha