Module Name: src
Committed By: matt
Date: Wed May 27 21:27:03 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc
Log Message:
Rework setting of __ARM_MAX_ARCH__ to better deal with BE arm MACHINE_ARCHes
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.5 Mon Mar 16 20:32:08 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc Wed May 27 21:27:03 2015
@@ -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
-CPPFLAGS += -D__ARM_MAX_ARCH__=8
-.endif
+.elif !empty(MACHINE_ARCH:Mearmv6*eb)
+CPPFLAGS += -D__ARM_MAX_ARCH__=6
.else
-CPPFLAGS += -D__ARM_MAX_ARCH__=4
+CPPFLAGS += -D__ARM_MAX_ARCH__=8
.endif
.include "../../crypto.inc"
