[src/trunk]: src/crypto/external/bsd/openssl/dist/crypto fix merge botch in p...

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

details:   https://anonhg.NetBSD.org/src/rev/2ed68a9b8b44
branches:  trunk
changeset: 449616:2ed68a9b8b44
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Mar 13 09:42:01 2019 +0000

description:
fix merge botch in previous.  i *think* this is now right.  it sure builds..

diffstat:

 crypto/external/bsd/openssl/dist/crypto/armcap.c |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r a48f9ace111f -r 2ed68a9b8b44 crypto/external/bsd/openssl/dist/crypto/armcap.c
--- a/crypto/external/bsd/openssl/dist/crypto/armcap.c  Wed Mar 13 09:23:59 2019 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/armcap.c  Wed Mar 13 09:42:01 2019 +0000
@@ -206,6 +206,7 @@
     }
 # endif
 
+#if __ARM_MAX_ARCH__>=7
     /* Things that getauxval didn't tell us */
     if (sigsetjmp(ill_jmp, 1) == 0) {
         _armv7_tick();