summaryrefslogtreecommitdiff
path: root/lib/builtins/assembly.h
diff options
context:
space:
mode:
authorWeiming Zhao <weimingz@codeaurora.org>2016-12-06 07:13:15 +0000
committerWeiming Zhao <weimingz@codeaurora.org>2016-12-06 07:13:15 +0000
commit2fb759fa512d51f791a5bc94a31d4b952f25d04a (patch)
treefb352b54fd7a2f74ba499141482573bbe19aa0b9 /lib/builtins/assembly.h
parenta3589846797e2fe4dec349b32f99ebbe330aba2f (diff)
downloadcompiler-rt-2fb759fa512d51f791a5bc94a31d4b952f25d04a.tar.gz
builtins: Add ARM Thumb1 implementation for uidiv and uidivmod
This is a resubmit of r288710 due to breakage of Darwin armv7em. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@288777 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/builtins/assembly.h')
-rw-r--r--lib/builtins/assembly.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/builtins/assembly.h b/lib/builtins/assembly.h
index 5e36b5a5e..377b3ea08 100644
--- a/lib/builtins/assembly.h
+++ b/lib/builtins/assembly.h
@@ -71,7 +71,8 @@
#define ARM_HAS_BX
#endif
#if !defined(__ARM_FEATURE_CLZ) && \
- (__ARM_ARCH >= 6 || (__ARM_ARCH == 5 && !defined(__ARM_ARCH_5__)))
+ ((__ARM_ARCH >= 6 && __ARM_ARCH_PROFILE != 'M') || \
+ (__ARM_ARCH == 5 && !defined(__ARM_ARCH_5__)))
#define __ARM_FEATURE_CLZ
#endif