Make sure OPENSSL_FIPSCANISTER is visible to ARM assembly language files.

[openssl.git] / crypto / arm_arch.h

diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index 8340d01823e95f3b3306bb1b46f1e898884a03c4..861e3def9e48ebfa2dfaef870199d0ae918b162b 100644 (file)
--- a/crypto/arm_arch.h
+++ b/crypto/arm_arch.h
@@ -18,7 +18,7 @@
    */
 #  if  defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)     || \
        defined(__ARM_ARCH_7R__)|| defined(__ARM_ARCH_7M__)     || \
-       defined(__ARM_ARCH_7EM)
+       defined(__ARM_ARCH_7EM__)
 #   define __ARM_ARCH__ 7
 #  elif        defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__)     || \
        defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__)     || \
@@ -35,5 +35,16 @@
 #  endif
 # endif
 
+#ifdef OPENSSL_FIPSCANISTER
+#include <openssl/fipssyms.h>
+#endif
+
+#if !__ASSEMBLER__
+extern unsigned int OPENSSL_armcap_P;
+                                     
+#define ARMV7_NEON      (1<<0)
+#define ARMV7_TICK      (1<<1)
+#endif
+
 #endif
 #endif