Add support for AMD64 processors and Microsoft Windows.

[catacomb] / symm / salsa20.c

diff --git a/symm/salsa20.c b/symm/salsa20.c
index 15e4d50..eb4e67a 100644 (file)
--- a/symm/salsa20.c
+++ b/symm/salsa20.c
@@ -52,14 +52,14 @@ static void simple_core(unsigned r, const salsa20_matrix src,
                        salsa20_matrix dest)
   { SALSA20_nR(dest, src, r); SALSA20_FFWD(dest, src); }
 
-#ifdef CPUFAM_X86
-extern core__functype salsa20_core_x86_sse2;
+#if CPUFAM_X86 || CPUFAM_AMD64
+extern core__functype salsa20_core_x86ish_sse2;
 #endif
 
 static core__functype *pick_core(void)
 {
-#ifdef CPUFAM_X86
-  DISPATCH_PICK_COND(salsa20_core, salsa20_core_x86_sse2,
+#if CPUFAM_X86 || CPUFAM_AMD64
+  DISPATCH_PICK_COND(salsa20_core, salsa20_core_x86ish_sse2,
                     cpu_feature_p(CPUFEAT_X86_SSE2));
 #endif
   DISPATCH_PICK_FALLBACK(salsa20_core, simple_core);