Merge branch '2.2.x'

[catacomb] / symm / chacha.c

diff --git a/symm/chacha.c b/symm/chacha.c
index 0c8aa00..cb879e3 100644 (file)
--- a/symm/chacha.c
+++ b/symm/chacha.c
@@ -76,12 +76,20 @@ static void simple_core(unsigned r, const chacha_matrix src,
 extern core__functype chacha_core_x86ish_sse2;
 #endif
 
+#if CPUFAM_ARMEL
+extern core__functype chacha_core_arm_neon;
+#endif
+
 static core__functype *pick_core(void)
 {
 #if CPUFAM_X86 || CPUFAM_AMD64
   DISPATCH_PICK_COND(chacha_core, chacha_core_x86ish_sse2,
                     cpu_feature_p(CPUFEAT_X86_SSE2));
 #endif
+#if CPUFAM_ARMEL
+  DISPATCH_PICK_COND(chacha_core, chacha_core_arm_neon,
+                    cpu_feature_p(CPUFEAT_ARM_NEON));
+#endif
   DISPATCH_PICK_FALLBACK(chacha_core, simple_core);
 }