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

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

details:   https://anonhg.NetBSD.org/src/rev/c77fbe4b93dd
branches:  trunk
changeset: 338495:c77fbe4b93dd
user:      matt <matt%NetBSD.org@localhost>
date:      Wed May 27 21:27:03 2015 +0000

description:
Rework setting of __ARM_MAX_ARCH__ to better deal with BE arm MACHINE_ARCHes

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc |  12 +++++-----
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (24 lines):

diff -r f90ee643645d -r c77fbe4b93dd crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc     Wed May 27 19:43:40 2015 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc     Wed May 27 21:27:03 2015 +0000
@@ -2,14 +2,14 @@
 CPUID_SRCS = armv4cpuid.S armcap.c armv4-mont.S armv4-gf2m.S
 CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
-.if ${MACHINE_ARCH:M*armv4*} == ""
-.      if ${MACHINE_ARCH} == "earmeb" || ${MACHINE_ARCH} == "earmhfeb"
+.if !empty(MACHINE_ARCH:Mearmv4*) || ${MACHINE_ARCH} == "armeb"
+CPPFLAGS += -D__ARM_MAX_ARCH__=4
+.elif ${MACHINE_ARCH} == "earmeb" || ${MACHINE_ARCH} == "earmhfeb"
 CPPFLAGS += -D__ARM_MAX_ARCH__=5
-.      else
+.elif !empty(MACHINE_ARCH:Mearmv6*eb)
+CPPFLAGS += -D__ARM_MAX_ARCH__=6
+.else
 CPPFLAGS += -D__ARM_MAX_ARCH__=8
 .endif
-.else
-CPPFLAGS += -D__ARM_MAX_ARCH__=4
-.endif
 .include "../../crypto.inc"