Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/sys/crypto Restrict the NEON code to v7hf - the softfl...



details:   https://anonhg.NetBSD.org/src/rev/075bb7f46c54
branches:  trunk
changeset: 974911:075bb7f46c54
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 16 15:52:14 2020 +0000

description:
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).

diffstat:

 tests/sys/crypto/aes/Makefile    |  6 +++---
 tests/sys/crypto/chacha/Makefile |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 26bc98ce0fc2 -r 075bb7f46c54 tests/sys/crypto/aes/Makefile
--- a/tests/sys/crypto/aes/Makefile     Sun Aug 16 14:39:50 2020 +0000
+++ b/tests/sys/crypto/aes/Makefile     Sun Aug 16 15:52:14 2020 +0000
@@ -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_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_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
 
diff -r 26bc98ce0fc2 -r 075bb7f46c54 tests/sys/crypto/chacha/Makefile
--- a/tests/sys/crypto/chacha/Makefile  Sun Aug 16 14:39:50 2020 +0000
+++ b/tests/sys/crypto/chacha/Makefile  Sun Aug 16 15:52:14 2020 +0000
@@ -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+=        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



Home | Main Index | Thread Index | Old Index