diff options
| -rw-r--r-- | sys/crypto/aes/arch/arm/files.aesneon | 4 | ||||
| -rw-r--r-- | sys/crypto/chacha/arch/arm/files.chacha_arm | 3 | ||||
| -rw-r--r-- | tests/sys/crypto/aes/Makefile | 6 | ||||
| -rw-r--r-- | tests/sys/crypto/chacha/Makefile | 5 |
4 files changed, 14 insertions, 4 deletions
diff --git a/sys/crypto/aes/arch/arm/files.aesneon b/sys/crypto/aes/arch/arm/files.aesneon index 2dc6dc22a13..77a32f72167 100644 --- a/sys/crypto/aes/arch/arm/files.aesneon +++ b/sys/crypto/aes/arch/arm/files.aesneon @@ -1,8 +1,10 @@ -# $NetBSD: files.aesneon,v 1.4 2020/08/16 18:02:03 riastradh Exp $ +# $NetBSD: files.aesneon,v 1.5 2020/09/08 17:35:27 jakllsch Exp $ ifdef aarch64 makeoptions aes "COPTS.aes_neon.c"+="-march=armv8-a" makeoptions aes "COPTS.aes_neon_subr.c"+="-march=armv8-a" +makeoptions aes "CWARNFLAGS.aes_neon.c"+="${${ACTIVE_CC} == clang :? -Wno-nonportable-vector-initialization :}" +makeoptions aes "CWARNFLAGS.aes_neon_subr.c"+="${${ACTIVE_CC} == clang :? -Wno-nonportable-vector-initialization :}" else makeoptions aes "COPTS.aes_neon.c"+="-mfloat-abi=softfp -mfpu=neon" makeoptions aes "COPTS.aes_neon_subr.c"+="-mfloat-abi=softfp -mfpu=neon" diff --git a/sys/crypto/chacha/arch/arm/files.chacha_arm b/sys/crypto/chacha/arch/arm/files.chacha_arm index 6bcacfa3478..0fab9b42f34 100644 --- a/sys/crypto/chacha/arch/arm/files.chacha_arm +++ b/sys/crypto/chacha/arch/arm/files.chacha_arm @@ -1,7 +1,8 @@ -# $NetBSD: files.chacha_arm,v 1.4 2020/09/08 17:17:32 jakllsch Exp $ +# $NetBSD: files.chacha_arm,v 1.5 2020/09/08 17:35:27 jakllsch Exp $ ifdef aarch64 makeoptions chacha "COPTS.chacha_neon.c"+="-march=armv8-a" +makeoptions chacha "CWARNFLAGS.chacha_neon.c"+="${${ACTIVE_CC} == clang :? -Wno-nonportable-vector-initialization :}" else makeoptions chacha "COPTS.chacha_neon.c"+="-mfloat-abi=softfp -mfpu=neon" endif diff --git a/tests/sys/crypto/aes/Makefile b/tests/sys/crypto/aes/Makefile index fe4d905f30c..054933d887f 100644 --- a/tests/sys/crypto/aes/Makefile +++ b/tests/sys/crypto/aes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2020/08/17 16:26:02 riastradh Exp $ +# $NetBSD: Makefile,v 1.6 2020/09/08 17:35:27 jakllsch Exp $ .include <bsd.own.mk> @@ -29,9 +29,13 @@ SRCS.t_aes+= aes_armv8.c SRCS.t_aes+= aes_armv8_64.S .endif +CLANG_NO_NONPORTABLE_VECTOR_INITIALIZATION= ${${ACTIVE_CC} == "clang":? -Wno-nonportable-vector-initialization :} + SRCS.t_aes+= aes_neon.c +COPTS.aes_neon.c+=${CLANG_NO_NONPORTABLE_VECTOR_INITIALIZATION} SRCS.t_aes+= aes_neon_impl.c SRCS.t_aes+= aes_neon_subr.c +COPTS.aes_neon_subr.c+=${CLANG_NO_NONPORTABLE_VECTOR_INITIALIZATION} .if !empty(MACHINE_ARCH:Mearmv7*) SRCS.t_aes+= aes_neon_32.S .endif diff --git a/tests/sys/crypto/chacha/Makefile b/tests/sys/crypto/chacha/Makefile index 7aa0ecf3edf..6882d015495 100644 --- a/tests/sys/crypto/chacha/Makefile +++ b/tests/sys/crypto/chacha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2020/08/17 16:26:02 riastradh Exp $ +# $NetBSD: Makefile,v 1.6 2020/09/08 17:35:27 jakllsch Exp $ .include <bsd.own.mk> @@ -21,7 +21,10 @@ SRCS.t_chacha+= chacha_selftest.c .PATH: ${NETBSDSRCDIR}/sys/crypto/chacha/arch/arm CPPFLAGS+= -I${NETBSDSRCDIR}/sys/crypto/chacha/arch/arm +CLANG_NO_NONPORTABLE_VECTOR_INITIALIZATION= ${${ACTIVE_CC} == "clang":? -Wno-nonportable-vector-initialization :} + SRCS.t_chacha+= chacha_neon.c +COPTS.chacha_neon.c+= ${CLANG_NO_NONPORTABLE_VECTOR_INITIALIZATION} .if !empty(MACHINE_ARCH:Mearmv7*) SRCS.t_chacha+= chacha_neon_32.S .elif !empty(MACHINE_ARCH:Maarch64*) |
