>From b6036dd2256edca0181aa25de2259bcd03b21c2e Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Fri, 24 Aug 2018 15:59:17 +0000 Subject: [PATCH] fix build failure on arm because of missing clz instruction In thumb mode clz is only available since armv6t2, in arm mode it is available since armv5. The preprocessor conditionals are changed accordingly. --- arch/arm/atomic_arch.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/atomic_arch.h b/arch/arm/atomic_arch.h index 62458b45..868e5758 100644 --- a/arch/arm/atomic_arch.h +++ b/arch/arm/atomic_arch.h @@ -82,7 +82,8 @@ static inline void a_crash() : : : "memory"); } -#if __ARM_ARCH >= 5 +#if __ARM_ARCH_6T2__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7 \ + || (__ARM_ARCH >= 5 && !__thumb__) #define a_clz_32 a_clz_32 static inline int a_clz_32(uint32_t x) -- 2.18.0