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

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

details:   https://anonhg.NetBSD.org/src/rev/9a3d40230161
branches:  trunk
changeset: 375849:9a3d40230161
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue May 16 18:25:54 2023 +0000

description:
openssl: Limit armv8 stuff to aarch64.

Strictly speaking there is armv8 aarch32, e.g. AES instructions are
exposed to 32-bit mode, but OpenSSL's `*_armv8.S' files are staunchly
aarch64 and don't work when built for aarch64 32-bit compat libraries
(which could take advantage of armv8 instructions, but only if the
code is actually aarch32, which it isn't).

The armv8 stuff is still included in aarch64 /usr/lib/libcrypto, just
not in the 32-bit compat libraries.

With any luck, this will fix the aarch64 clang build (again).

diffstat:

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

diffs (29 lines):

diff -r 43a82160e21b -r 9a3d40230161 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc        Tue May 16 13:26:26 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc        Tue May 16 18:25:54 2023 +0000
@@ -3,10 +3,7 @@
 .PATH.S: ${.PARSEDIR}
 AES_SRCS += aes-armv4.S aes_cbc.c aesv8-armx.S
 
-.if ${ARM_MAX_ARCH} >= 8
-AES_SRCS+=vpaes-armv8.S
-AESCPPFLAGS += -DVPAES_ASM
-.elif ${ARM_MAX_ARCH} >= 7
+.if ${ARM_MAX_ARCH} >= 7
 AES_SRCS+=bsaes-armv7.S
 AESCPPFLAGS += -DBSAES_ASM
 .endif
diff -r 43a82160e21b -r 9a3d40230161 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc Tue May 16 13:26:26 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc Tue May 16 18:25:54 2023 +0000
@@ -1,9 +1,6 @@
 .PATH.S: ${.PARSEDIR}
 
-.if ${ARM_MAX_ARCH} >= 8
-EC_SRCS += ecp_nistz256-armv8.S
-ECNI = yes
-.elif ${ARM_MAX_ARCH} >= 4
+.if ${ARM_MAX_ARCH} >= 4
 EC_SRCS += ecp_nistz256-armv4.S
 ECNI = yes
 .endif