X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/226639f3441312d535bccf45b1c0d15d0ae156a1..646d0305bfee5d72982ce01151989797b0f5f139:/symm/rijndael-base.c?ds=sidebyside

diff --git a/symm/rijndael-base.c b/symm/rijndael-base.c
index 6e59130c..b0505a66 100644
--- a/symm/rijndael-base.c
+++ b/symm/rijndael-base.c
@@ -116,16 +116,17 @@ 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
-  if (cpu_feature_p(CPUFEAT_X86_AESNI)) return 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
-  return simple_setup;
+  DISPATCH_PICK_FALLBACK(rijndael_setup, simple_setup);
 }
 
 void rijndael_setup(rijndael_ctx *k, unsigned nb, const void *buf, size_t sz)