From c1669e1c205dc8e695fb0c10a655f434e758b9f7 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Fri, 7 Nov 2014 22:48:22 +0100 Subject: Remove inconsistency in ARM support. This facilitates "universal" builds, ones that target multiple architectures, e.g. ARMv5 through ARMv7. See commentary in Configure for details. Reviewed-by: Ard Biesheuvel Reviewed-by: Matt Caswell --- crypto/arm_arch.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'crypto/arm_arch.h') diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h index d406c8c229..9a125d878b 100644 --- a/crypto/arm_arch.h +++ b/crypto/arm_arch.h @@ -48,6 +48,18 @@ # endif #endif +#if !defined(__ARM_MAX_ARCH__) +# define __ARM_MAX_ARCH__ __ARM_ARCH__ +#endif + +#if __ARM_MAX_ARCH__<__ARM_ARCH__ +# error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__" +#elif __ARM_MAX_ARCH__!=__ARM_ARCH__ +# if __ARM_ARCH__<7 && __ARM_MAX_ARCH__>=7 && defined(__ARMEB__) +# error "can't build universal big-endian binary" +# endif +#endif + #if !__ASSEMBLER__ extern unsigned int OPENSSL_armcap_P; #endif -- cgit v1.2.3