Module Name: src
Committed By: mrg
Date: Wed Mar 13 09:42:01 UTC 2019
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: armcap.c
Log Message:
fix merge botch in previous. i *think* this is now right. it sure builds..
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/armcap.c
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/dist/crypto/armcap.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/armcap.c:1.9 src/crypto/external/bsd/openssl/dist/crypto/armcap.c:1.10
--- src/crypto/external/bsd/openssl/dist/crypto/armcap.c:1.9 Tue Mar 12 16:58:12 2019
+++ src/crypto/external/bsd/openssl/dist/crypto/armcap.c Wed Mar 13 09:42:01 2019
@@ -206,6 +206,7 @@ void OPENSSL_cpuid_setup(void)
}
# endif
+#if __ARM_MAX_ARCH__>=7
/* Things that getauxval didn't tell us */
if (sigsetjmp(ill_jmp, 1) == 0) {
_armv7_tick();
