[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm make arm ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d91f225d4aeb
branches:  trunk
changeset: 375313:d91f225d4aeb
user:      christos <christos%NetBSD.org@localhost>
date:      Sun May 14 17:50:29 2023 +0000

description:
make arm build

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc |  12 +++++++-----
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc  |  12 ++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 937b4385e3c6 -r d91f225d4aeb crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc        Sun May 14 17:21:53 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc        Sun May 14 17:50:29 2023 +0000
@@ -1,13 +1,15 @@
 .include "arm.inc"
 
 .PATH.S: ${.PARSEDIR}
-AES_SRCS += aes-armv4.S aes_cbc.c
+AES_SRCS += aes-armv4.S aes_cbc.c aesv8-armx.S
 
-.if ${ARM_MAX_ARCH} >= 7
+.if ${ARM_MAX_ARCH} >= 8
+AES_SRCS+=vpaes-armv8.S
+AESCPPFLAGS += -DVPAES_ASM
+.elif ${ARM_MAX_ARCH} >= 7
 AES_SRCS+=bsaes-armv7.S
-.elif ${ARM_MAX_ARCH} >= 8
-AES_SRCS+=aesv8-armx.S
+AESCPPFLAGS += -DBSAES_ASM
 .endif
 
-AESCPPFLAGS = -DAES_ASM -DBSAES_ASM
+AESCPPFLAGS += -DAES_ASM
 .include "../../aes.inc"
diff -r 937b4385e3c6 -r d91f225d4aeb crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc Sun May 14 17:50:29 2023 +0000
@@ -0,0 +1,12 @@
+.PATH.S: ${.PARSEDIR}
+
+.if ${ARM_MAX_ARCH} >= 8
+EC_SRCS += ecp_nistz256-armv8.S
+ECNI = yes
+.elif ${ARM_MAX_ARCH} >= 4
+EC_SRCS += ecp_nistz256-armv4.S
+ECNI = yes
+.endif
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"