Module Name: src
Committed By: martin
Date: Sun Aug 16 15:52:14 UTC 2020
Modified Files:
src/tests/sys/crypto/aes: Makefile
src/tests/sys/crypto/chacha: Makefile
Log Message:
Restrict the NEON code to v7hf - the softfloat toolchain does not like
it (nor is it likely to work if there is no FPU present).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/sys/crypto/aes/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/sys/crypto/chacha/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/crypto/aes/Makefile
diff -u src/tests/sys/crypto/aes/Makefile:1.3 src/tests/sys/crypto/aes/Makefile:1.4
--- src/tests/sys/crypto/aes/Makefile:1.3 Sat Jul 25 22:33:04 2020
+++ src/tests/sys/crypto/aes/Makefile Sun Aug 16 15:52:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/07/25 22:33:04 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2020/08/16 15:52:14 martin Exp $
.include <bsd.own.mk>
@@ -19,7 +19,7 @@ SRCS.t_aes+= aes_ct_dec.c
SRCS.t_aes+= aes_ct_enc.c
SRCS.t_aes+= aes_selftest.c
-.if !empty(MACHINE_ARCH:Mearmv7*) || !empty(MACHINE_ARCH:Maarch64*)
+.if !empty(MACHINE_ARCH:Mearmv7hf*) || !empty(MACHINE_ARCH:Maarch64*)
.PATH: ${NETBSDSRCDIR}/sys/crypto/aes/arch/arm
CPPFLAGS+= -I${NETBSDSRCDIR}/sys/crypto/aes/arch/arm
@@ -32,7 +32,7 @@ SRCS.t_aes+= aes_armv8_64.S
SRCS.t_aes+= aes_neon.c
SRCS.t_aes+= aes_neon_impl.c
SRCS.t_aes+= aes_neon_subr.c
-.if !empty(MACHINE_ARCH:Mearmv7*)
+.if !empty(MACHINE_ARCH:Mearmv7hf*)
SRCS.t_aes+= aes_neon_32.S
.endif
Index: src/tests/sys/crypto/chacha/Makefile
diff -u src/tests/sys/crypto/chacha/Makefile:1.3 src/tests/sys/crypto/chacha/Makefile:1.4
--- src/tests/sys/crypto/chacha/Makefile:1.3 Tue Jul 28 20:08:48 2020
+++ src/tests/sys/crypto/chacha/Makefile Sun Aug 16 15:52:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/07/28 20:08:48 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2020/08/16 15:52:14 martin Exp $
.include <bsd.own.mk>
@@ -16,13 +16,13 @@ SRCS.t_chacha+= t_chacha.c
SRCS.t_chacha+= chacha_ref.c
SRCS.t_chacha+= chacha_selftest.c
-.if !empty(MACHINE_ARCH:Mearmv7*) || !empty(MACHINE_ARCH:Maarch64*)
+.if !empty(MACHINE_ARCH:Mearmv7hf*) || !empty(MACHINE_ARCH:Maarch64*)
.PATH: ${NETBSDSRCDIR}/sys/crypto/chacha/arch/arm
CPPFLAGS+= -I${NETBSDSRCDIR}/sys/crypto/chacha/arch/arm
SRCS.t_chacha+= chacha_neon.c
-.if !empty(MACHINE_ARCH:Mearmv7*)
+.if !empty(MACHINE_ARCH:Mearmv7hf*)
SRCS.t_chacha+= chacha_neon_32.S
.elif !empty(MACHINE_ARCH:Maarch64*)
SRCS.t_chacha+= chacha_neon_64.S
