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

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

details:   https://anonhg.NetBSD.org/src/rev/6df5106a60fd
branches:  trunk
changeset: 321246:6df5106a60fd
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Mar 07 20:38:39 2018 +0000

description:
fix build on non-earm

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc    |  11 +++++++-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc |  14 +---------
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc  |   4 +++
 3 files changed, 16 insertions(+), 13 deletions(-)

diffs (57 lines):

diff -r 282d0d7871e5 -r 6df5106a60fd crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc        Wed Mar 07 19:44:31 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc        Wed Mar 07 20:38:39 2018 +0000
@@ -1,4 +1,13 @@
+.include "arm.inc"
+
 .PATH.S: ${.PARSEDIR}
-AES_SRCS = aes-armv4.S aesv8-armx.S bsaes-armv7.S aes_cbc.c
+AES_SRCS += aes-armv4.S aes_cbc.c
+
+.if ${ARM_MAX_ARCH} >= 7
+AES_SRCS+=bsaes-armv7.S
+.elif ${ARM_MAX_ARCH} >= 8
+AES_SRCS+=aesv8-armx.S
+.endif
+
 AESCPPFLAGS = -DAES_ASM -DBSAES_ASM
 .include "../../aes.inc"
diff -r 282d0d7871e5 -r 6df5106a60fd crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc     Wed Mar 07 19:44:31 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc     Wed Mar 07 20:38:39 2018 +0000
@@ -1,18 +1,8 @@
 .PATH.S: ${.PARSEDIR}
+
 CPUID_SRCS += armv4cpuid.S armcap.c armv4-mont.S armv4-gf2m.S
 CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
-.if !empty(MACHINE_ARCH:Mearmv4*) || ${MACHINE_ARCH} == "armeb"
-ARM_MAX_ARCH=4
-.elif ${MACHINE_ARCH} == "earmeb" || ${MACHINE_ARCH} == "earmhfeb"
-ARM_MAX_ARCH=5
-.elif !empty(MACHINE_ARCH:Mearmv6*)
-ARM_MAX_ARCH=6
-.elif !empty(MACHINE_ARCH:Mearmv7*)
-ARM_MAX_ARCH=7
-.else
-ARM_MAX_ARCH=8
-.endif
-CPPFLAGS += -D__ARM_MAX_ARCH__=${ARM_MAX_ARCH}
+
 .include "../../crypto.inc"
 
diff -r 282d0d7871e5 -r 6df5106a60fd crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc      Wed Mar 07 19:44:31 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc      Wed Mar 07 20:38:39 2018 +0000
@@ -1,7 +1,11 @@
+.include "arm.inc"
+
 .PATH.S: ${.PARSEDIR}
 MODES_SRCS += ghash-armv4.S
+
 .if ${ARM_MAX_ARCH} >= 8
 MODES_SRCS += ghashv8-armx.S
 .endif
+
 MODESCPPFLAGS = -DGHASH_ASM
 .include "../../modes.inc"