X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=crypto%2Farm_arch.h;h=5a831076800338f3447bde20c4e78544a2700d5c;hb=2a21cdbe6bd608e62a5daa70309af4982b391dd1;hp=8340d01823e95f3b3306bb1b46f1e898884a03c4;hpb=e512375186c13e5f991a47089ef107a01db6fd87;p=openssl.git

diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index 8340d01823..5a83107680 100644
--- 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__)	|| \
@@ -26,7 +26,8 @@
 	defined(__ARM_ARCH_6T2__)
 #   define __ARM_ARCH__ 6
 #  elif	defined(__ARM_ARCH_5__)	|| defined(__ARM_ARCH_5T__)	|| \
-	defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__)
+	defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__)	|| \
+	defined(__ARM_ARCH_5TEJ__)
 #   define __ARM_ARCH__ 5
 #  elif	defined(__ARM_ARCH_4__)	|| defined(__ARM_ARCH_4T__)
 #   define __ARM_ARCH__ 4
@@ -34,6 +35,17 @@
 #   error "unsupported ARM architecture"
 #  endif
 # 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