ARM assembly pack: make it work with older toolchain.

[openssl.git] / crypto / arm_arch.h

diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index 15027ed3de3c0ae5d1c40c31bb311445934d9d5a..5a831076800338f3447bde20c4e78544a2700d5c 100644 (file)
--- 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
 
@@ -47,4 +49,3 @@ extern unsigned int OPENSSL_armcap_P;
 #endif
 
 #endif
-#endif