Module Name: src
Committed By: jakllsch
Date: Tue Sep 8 17:35:27 UTC 2020
Modified Files:
src/sys/crypto/aes/arch/arm: files.aesneon
src/sys/crypto/chacha/arch/arm: files.chacha_arm
src/tests/sys/crypto/aes: Makefile
src/tests/sys/crypto/chacha: Makefile
Log Message:
Acknowledge clang warning for NEON cipher code on aarch64eb
We've already made the nonportable vector initializations portable; the
code works on aarch64eb.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/crypto/aes/arch/arm/files.aesneon
cvs rdiff -u -r1.4 -r1.5 src/sys/crypto/chacha/arch/arm/files.chacha_arm
cvs rdiff -u -r1.5 -r1.6 src/tests/sys/crypto/aes/Makefile
cvs rdiff -u -r1.5 -r1.6 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/sys/crypto/aes/arch/arm/files.aesneon
diff -u src/sys/crypto/aes/arch/arm/files.aesneon:1.4 src/sys/crypto/aes/arch/arm/files.aesneon:1.5
--- src/sys/crypto/aes/arch/arm/files.aesneon:1.4 Sun Aug 16 18:02:03 2020
+++ src/sys/crypto/aes/arch/arm/files.aesneon Tue Sep 8 17:35:27 2020
@@ -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"
Index: src/sys/crypto/chacha/arch/arm/files.chacha_arm
diff -u src/sys/crypto/chacha/arch/arm/files.chacha_arm:1.4 src/sys/crypto/chacha/arch/arm/files.chacha_arm:1.5
--- src/sys/crypto/chacha/arch/arm/files.chacha_arm:1.4 Tue Sep 8 17:17:32 2020
+++ src/sys/crypto/chacha/arch/arm/files.chacha_arm Tue Sep 8 17:35:27 2020
@@ -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
Index: src/tests/sys/crypto/aes/Makefile
diff -u src/tests/sys/crypto/aes/Makefile:1.5 src/tests/sys/crypto/aes/Makefile:1.6
--- src/tests/sys/crypto/aes/Makefile:1.5 Mon Aug 17 16:26:02 2020
+++ src/tests/sys/crypto/aes/Makefile Tue Sep 8 17:35:27 2020
@@ -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
Index: src/tests/sys/crypto/chacha/Makefile
diff -u src/tests/sys/crypto/chacha/Makefile:1.5 src/tests/sys/crypto/chacha/Makefile:1.6
--- src/tests/sys/crypto/chacha/Makefile:1.5 Mon Aug 17 16:26:02 2020
+++ src/tests/sys/crypto/chacha/Makefile Tue Sep 8 17:35:27 2020
@@ -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*)
