diff options
| author | mrg <mrg@NetBSD.org> | 2019-03-13 09:42:01 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2019-03-13 09:42:01 +0000 |
| commit | 9823ae7ede03dc89594446a8cc18facafc984a7e (patch) | |
| tree | d15ee5ca3c33c8c4187d12fe79a52bba042efcb0 /crypto | |
| parent | b410dd684330ad14d6f1e5da3c05e79c88b412c9 (diff) | |
fix merge botch in previous. i *think* this is now right. it sure builds..
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/external/bsd/openssl/dist/crypto/armcap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/external/bsd/openssl/dist/crypto/armcap.c b/crypto/external/bsd/openssl/dist/crypto/armcap.c index e2c3cf52130..2a706df7ced 100644 --- a/crypto/external/bsd/openssl/dist/crypto/armcap.c +++ b/crypto/external/bsd/openssl/dist/crypto/armcap.c @@ -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(); |
