X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Farm_arch.h;h=d68318c851919416a1c3bb07d1964d1aea3bf010;hp=15027ed3de3c0ae5d1c40c31bb311445934d9d5a;hb=8bbfd94e36559ceb7187d4d8a63e950713b93e0d;hpb=87873f4328274fc64b4089de6deabf52e5b2d481

diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index 15027ed3de..d68318c851 100644
--- a/crypto/arm_arch.h
+++ b/crypto/arm_arch.h
@@ -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,8 +35,9 @@
 #   error "unsupported ARM architecture"
 #  endif
 # endif
+#endif
 
-#ifdef OPENSSL_FIPSCANISTERBUILD
+#ifdef OPENSSL_FIPSCANISTER
 #include <openssl/fipssyms.h>
 #endif
 
@@ -44,7 +46,10 @@ extern unsigned int OPENSSL_armcap_P;
                                      
 #define ARMV7_NEON      (1<<0)
 #define ARMV7_TICK      (1<<1)
+#define ARMV8_AES       (1<<2)
+#define ARMV8_SHA1      (1<<3)
+#define ARMV8_SHA256    (1<<4)
+#define ARMV8_PMULL     (1<<5)
 #endif
 
 #endif
-#endif