X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/fac645f7780c7673775f09fe625651f600f7ee7b..1a3849032ebf2e7d17b7ee421af28b17f4de1407:/symm/rijndael-base.c diff --git a/symm/rijndael-base.c b/symm/rijndael-base.c index 3d2bb8ef..b5490c1d 100644 --- a/symm/rijndael-base.c +++ b/symm/rijndael-base.c @@ -112,18 +112,18 @@ static void simple_setup(rijndael_ctx *k, unsigned nb, k->wi[i] = k->w[j + jj++]; } -CPU_DISPATCH(static, EMPTY, void, setup, (rijndael_ctx *k, unsigned nb, - const void *buf, unsigned nk), +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);