fix error discrepancy

[openssl.git] / crypto / armcap.c

diff --git a/crypto/armcap.c b/crypto/armcap.c
index 7e46d07a3232c06cb359fbc64110c21680c80e84..24f7a0829a697eee2e8fe84bb7ccd3a5ee78ffe7 100644 (file)
--- 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