Module Name: src
Committed By: riastradh
Date: Tue Jun 30 17:03:14 UTC 2020
Modified Files:
src/sys/crypto/aes/arch/arm: files.aesneon
Log Message:
Limit aes_neon to cpu_cortex | aarch64.
We won't use it on any other systems, and it doesn't build without
NEON anyway. Verified earmv7hf GENERIC, aarch64 GENERIC64, and
earmv6 RPI2 all build with this.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/crypto/aes/arch/arm/files.aesneon
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/files.aesneon
diff -u src/sys/crypto/aes/arch/arm/files.aesneon:1.2 src/sys/crypto/aes/arch/arm/files.aesneon:1.3
--- src/sys/crypto/aes/arch/arm/files.aesneon:1.2 Mon Jun 29 23:57:56 2020
+++ src/sys/crypto/aes/arch/arm/files.aesneon Tue Jun 30 17:03:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.aesneon,v 1.2 2020/06/29 23:57:56 riastradh Exp $
+# $NetBSD: files.aesneon,v 1.3 2020/06/30 17:03:13 riastradh Exp $
ifdef aarch64
makeoptions aes "COPTS.aes_neon.c"+="-march=armv8-a"
@@ -8,10 +8,8 @@ makeoptions aes "COPTS.aes_neon.c"+="-mf
makeoptions aes "COPTS.aes_neon_subr.c"+="-mfloat-abi=softfp -mfpu=neon"
endif
-file crypto/aes/arch/arm/aes_neon.c aes
-file crypto/aes/arch/arm/aes_neon_impl.c aes
-file crypto/aes/arch/arm/aes_neon_subr.c aes
+file crypto/aes/arch/arm/aes_neon.c aes & (cpu_cortex | aarch64)
+file crypto/aes/arch/arm/aes_neon_impl.c aes & (cpu_cortex | aarch64)
+file crypto/aes/arch/arm/aes_neon_subr.c aes & (cpu_cortex | aarch64)
-ifndef aarch64
-file crypto/aes/arch/arm/aes_neon_32.S aes
-endif
+file crypto/aes/arch/arm/aes_neon_32.S aes & cpu_cortex & !aarch64
