Module Name: src
Committed By: christos
Date: Wed Mar 7 20:38:39 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc
crypto.inc modes.inc
Log Message:
fix build on non-earm
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.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/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.4 Sun Mar 29 19:35:08 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc Wed Mar 7 15:38:39 2018
@@ -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"
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.8 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.9
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.8 Tue Mar 6 08:37:43 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc Wed Mar 7 15:38:39 2018
@@ -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"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.3 Fri Mar 2 19:20:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc Wed Mar 7 15:38:39 2018
@@ -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"
