diff options
| author | Manoj Gupta <manojgupta@google.com> | 2017-09-27 19:06:47 +0000 |
|---|---|---|
| committer | Manoj Gupta <manojgupta@google.com> | 2017-09-27 19:06:47 +0000 |
| commit | ebab2240598af2c3e750e7934f4ff71158b52384 (patch) | |
| tree | 3fa761871b54f1a018c9f8a4c46282cd5b5932f2 /lib/builtins/arm | |
| parent | 3ac72d80925e1bc74dfafec727263e4ae45d14fd (diff) | |
[builtins] ARM: Revert r314284, r314285 and r314289
Revert r314284, r314285 and r314289 because of a reported
breakage in armv7k watchos builder.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@314333 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/builtins/arm')
| -rw-r--r-- | lib/builtins/arm/aeabi_cdcmp.S | 2 | ||||
| -rw-r--r-- | lib/builtins/arm/aeabi_cfcmp.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/builtins/arm/aeabi_cdcmp.S b/lib/builtins/arm/aeabi_cdcmp.S index f18cfa46b..b06f294e2 100644 --- a/lib/builtins/arm/aeabi_cdcmp.S +++ b/lib/builtins/arm/aeabi_cdcmp.S @@ -48,7 +48,7 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_cdcmpeq) // NaN has been ruled out, so __aeabi_cdcmple can't trap bne __aeabi_cdcmple -#if defined(USE_THUMB_2) +#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) mov ip, #APSR_C msr APSR_nzcvq, ip #else diff --git a/lib/builtins/arm/aeabi_cfcmp.S b/lib/builtins/arm/aeabi_cfcmp.S index fc0dbcaa0..7bc84073f 100644 --- a/lib/builtins/arm/aeabi_cfcmp.S +++ b/lib/builtins/arm/aeabi_cfcmp.S @@ -48,7 +48,7 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_cfcmpeq) // NaN has been ruled out, so __aeabi_cfcmple can't trap bne __aeabi_cfcmple -#if defined(USE_THUMB_2) +#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) mov ip, #APSR_C msr APSR_nzcvq, ip #else |