Add support for AMD64 processors and Microsoft Windows.

[catacomb] / symm / rijndael-base.c

diff --git a/symm/rijndael-base.c b/symm/rijndael-base.c
index 3d2bb8e..b0505a6 100644 (file)
--- a/symm/rijndael-base.c
+++ b/symm/rijndael-base.c
@@ -116,14 +116,14 @@ CPU_DISPATCH(static, EMPTY, void, setup, (rijndael_ctx *k, unsigned nb,
                                          const void *buf, unsigned nk),
             (k, nb, buf, nk), pick_setup, simple_setup)
 
-#ifdef CPUFAM_X86
-extern setup__functype rijndael_setup_x86_aesni;
+#if CPUFAM_X86 || CPUFAM_AMD64
+extern setup__functype rijndael_setup_x86ish_aesni;
 #endif
 
 static setup__functype *pick_setup(void)
 {
-#ifdef CPUFAM_X86
-  DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86_aesni,
+#if CPUFAM_X86 || CPUFAM_AMD64
+  DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86ish_aesni,
                     cpu_feature_p(CPUFEAT_X86_AESNI));
 #endif
   DISPATCH_PICK_FALLBACK(rijndael_setup, simple_setup);