~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile.am: Include $(PIXIE_LIBS) in the main library.
[catacomb]
/
symm
/
rijndael-base.c
diff --git
a/symm/rijndael-base.c
b/symm/rijndael-base.c
index
6e59130
..
b0505a6
100644
(file)
--- 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)
const void *buf, unsigned nk),
(k, nb, buf, nk), pick_setup, simple_setup)
-#if
def CPUFAM_X86
-extern setup__functype rijndael_setup_x86_aesni;
+#if
CPUFAM_X86 || CPUFAM_AMD64
+extern setup__functype rijndael_setup_x86
ish
_aesni;
#endif
static setup__functype *pick_setup(void)
{
#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
#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)
}
void rijndael_setup(rijndael_ctx *k, unsigned nb, const void *buf, size_t sz)