diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-11-07 22:48:22 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-01-06 11:14:23 +0100 |
| commit | f4868c99213c2b67d84e4506571216d23aa2d9fb (patch) | |
| tree | a5d8110ec3da4406da7226db1d7b8ce3b8e7ec12 /crypto/armcap.c | |
| parent | 4aaf1e493cb86efa64f6a486a27d38da6bce23af (diff) | |
Remove inconsistency in ARM support.
This facilitates "universal" builds, ones that target multiple
architectures, e.g. ARMv5 through ARMv7. See commentary in
Configure for details.
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit c1669e1c205dc8e695fb0c10a655f434e758b9f7)
Diffstat (limited to 'crypto/armcap.c')
| -rw-r--r-- | crypto/armcap.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/armcap.c b/crypto/armcap.c index 7e46d07a32..24f7a0829a 100644 --- a/crypto/armcap.c +++ b/crypto/armcap.c @@ -7,8 +7,12 @@ #include "arm_arch.h" -unsigned int OPENSSL_armcap_P; +unsigned int OPENSSL_armcap_P=0; +#if __ARM_MAX_ARCH__<7 +void OPENSSL_cpuid_setup(void) {} +unsigned long OPENSSL_rdtsc(void) { return 0; } +#else static sigset_t all_masked; static sigjmp_buf ill_jmp; @@ -155,3 +159,4 @@ void OPENSSL_cpuid_setup(void) sigaction (SIGILL,&ill_oact,NULL); sigprocmask(SIG_SETMASK,&oset,NULL); } +#endif |