From 74bf57c84244034d15cee03353bcc4458371abf7 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 9 Nov 2018 18:23:07 +0100 Subject: chacha20,poly1305: use CONFIG_KERNEL_MODE_NEON in .pl on arm While Andy is right to desire a separation between compiler defines and project defines, there are simply too many odd kernel configurations and we require testing for CONFIG_KERNEL_MODE_NEON. --- src/crypto/zinc/chacha20/chacha20-arm.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/crypto/zinc/chacha20/chacha20-arm.pl') diff --git a/src/crypto/zinc/chacha20/chacha20-arm.pl b/src/crypto/zinc/chacha20/chacha20-arm.pl index 3621957..6a7d62c 100644 --- a/src/crypto/zinc/chacha20/chacha20-arm.pl +++ b/src/crypto/zinc/chacha20/chacha20-arm.pl @@ -693,7 +693,7 @@ my ($a,$b,$c,$d,$t)=@_; } $code.=<<___; -#if __ARM_MAX_ARCH__>=7 +#if (defined(__KERNEL__) && defined(CONFIG_KERNEL_MODE_NEON)) || (!defined(__KERNEL__) && __ARM_MAX_ARCH__>=7) .arch armv7-a .fpu neon -- cgit v1.2.3-59-g8ed1b