aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/crypto/zinc/chacha20
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm.pl2
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm64.pl3
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
___
}
}}}