diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-11-09 18:23:07 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-11-14 23:59:05 -0800 |
| commit | 5c67177dcc6a23ceccaf8e69daf92a8a12212732 (patch) | |
| tree | 714164fd114323cb39adcbf22798a0d81dfee364 /src/crypto/zinc/chacha20 | |
| parent | cc36bde00d67f15d8657c2fa6f450dccf4fb76b7 (diff) | |
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.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/crypto/zinc/chacha20')
| -rw-r--r-- | src/crypto/zinc/chacha20/chacha20-arm.pl | 2 | ||||
| -rw-r--r-- | src/crypto/zinc/chacha20/chacha20-arm64.pl | 3 |
2 files changed, 3 insertions, 2 deletions
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 diff --git a/src/crypto/zinc/chacha20/chacha20-arm64.pl b/src/crypto/zinc/chacha20/chacha20-arm64.pl index 7926c8d..bb148c2 100644 --- a/src/crypto/zinc/chacha20/chacha20-arm64.pl +++ b/src/crypto/zinc/chacha20/chacha20-arm64.pl @@ -385,7 +385,7 @@ my ($a,$b,$c,$d,$t)=@_; } $code.=<<___; - +#if !defined(__KERNEL__) || defined(CONFIG_KERNEL_MODE_NEON) #ifdef __KERNEL__ .globl ChaCha20_neon .type ChaCha20_neon,%function @@ -1136,6 +1136,7 @@ $code.=<<___; ret .size ChaCha20_512_neon,.-ChaCha20_512_neon #endif +#endif ___ } }}} |