[compiler-rt] r288954 - [builtin] for the condition for check __ARM_FEATURE_CLZ

[Weiming Zhao via llvm-commits]

Author: weimingz
Date: Wed Dec  7 12:41:07 2016
New Revision: 288954

URL: http://llvm.org/viewvc/llvm-project?rev=288954&view=rev
Log:
[builtin] for the condition for check __ARM_FEATURE_CLZ

Summary: Since CLZ is not available for Thumb1, we use __ARM_ARCH_ISA_THUMB != 1 as one of the conditions.

Reviewers: rnk, compnerd, rengolin

Subscribers: aemerson, rengolin, llvm-commits

Differential Revision: https://reviews.llvm.org/D27530

Modified:
    compiler-rt/trunk/lib/builtins/assembly.h

Modified: compiler-rt/trunk/lib/builtins/assembly.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/assembly.h?rev=288954&r1=288953&r2=288954&view=diff
==============================================================================
--- compiler-rt/trunk/lib/builtins/assembly.h (original)
+++ compiler-rt/trunk/lib/builtins/assembly.h Wed Dec  7 12:41:07 2016
@@ -70,9 +70,8 @@
 #if defined(__ARM_ARCH_4T__) || __ARM_ARCH >= 5
 #define ARM_HAS_BX
 #endif
-#if !defined(__ARM_FEATURE_CLZ) &&                                             \
-    ((__ARM_ARCH >= 6 && __ARM_ARCH_PROFILE != 'M') ||                         \
-     (__ARM_ARCH == 5 && !defined(__ARM_ARCH_5__)))
+#if !defined(__ARM_FEATURE_CLZ) && __ARM_ARCH_ISA_THUMB != 1 &&                \
+    (__ARM_ARCH >= 6 || (__ARM_ARCH == 5 && !defined(__ARM_ARCH_5__)))
 #define __ARM_FEATURE_CLZ
 #endif