Module Name: src
Committed By: rin
Date: Sat Nov 21 08:09:21 UTC 2020
Modified Files:
src/sys/crypto/aes/arch/arm: aes_neon.c
Log Message:
Fix build with clang for earmv7hf; loadroundkey() is used only for __aarch64__.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/crypto/aes/arch/arm/aes_neon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/crypto/aes/arch/arm/aes_neon.c
diff -u src/sys/crypto/aes/arch/arm/aes_neon.c:1.5 src/sys/crypto/aes/arch/arm/aes_neon.c:1.6
--- src/sys/crypto/aes/arch/arm/aes_neon.c:1.5 Sat Aug 8 14:47:01 2020
+++ src/sys/crypto/aes/arch/arm/aes_neon.c Sat Nov 21 08:09:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: aes_neon.c,v 1.5 2020/08/08 14:47:01 riastradh Exp $ */
+/* $NetBSD: aes_neon.c,v 1.6 2020/11/21 08:09:21 rin Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aes_neon.c,v 1.5 2020/08/08 14:47:01 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aes_neon.c,v 1.6 2020/11/21 08:09:21 rin Exp $");
#include <sys/types.h>
@@ -196,11 +196,13 @@ inv = VQ_N_U8(0x80,0x01,0x08,0x0D,0x0F,0
inva = VQ_N_U8(0x80,0x07,0x0B,0x0F,0x06,0x0A,0x04,0x01,
0x09,0x08,0x05,0x02,0x0C,0x0E,0x0D,0x03);
+#ifdef __aarch64__
static inline uint8x16_t
loadroundkey(const void *rkp)
{
return vld1q_u8(rkp);
}
+#endif
static inline void
storeroundkey(void *rkp, uint8x16_t rk)
