Add support for AMD64 processors and Microsoft Windows.

[catacomb] / symm / chacha.c

diff --git a/symm/chacha.c b/symm/chacha.c
index 5683c8e..80a84c1 100644 (file)
--- a/symm/chacha.c
+++ b/symm/chacha.c
@@ -72,14 +72,14 @@ static void simple_core(unsigned r, const chacha_matrix src,
                        chacha_matrix dest)
   { CHACHA_nR(dest, src, r); CHACHA_FFWD(dest, src); }
 
-#ifdef CPUFAM_X86
-extern core__functype chacha_core_x86_sse2;
+#if CPUFAM_X86 || CPUFAM_AMD64
+extern core__functype chacha_core_x86ish_sse2;
 #endif
 
 static core__functype *pick_core(void)
 {
-#ifdef CPUFAM_X86
-  DISPATCH_PICK_COND(chacha_core, chacha_core_x86_sse2,
+#if CPUFAM_X86 || CPUFAM_AMD64
+  DISPATCH_PICK_COND(chacha_core, chacha_core_x86ish_sse2,
                     cpu_feature_p(CPUFEAT_X86_SSE2));
 #endif
   DISPATCH_PICK_FALLBACK(chacha_core, simple_core);