diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-01-22 19:20:24 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-01-22 19:20:24 +0000 |
| commit | 9c710df9281cb5cffa849396f28c8fe1fc9f1be5 (patch) | |
| tree | 3451054a07a2086459ee553883b5773d5b5f860f /contrib/compiler-rt/lib/builtins/arm/aeabi_cdcmp.S | |
| parent | 58a7b5d64a70fcdddb5dc4c92e53d9d3abcb5ae6 (diff) | |
| parent | 0646903fc1f75f6e605754621119473ee083f4a4 (diff) | |
Merge compiler-rt trunk r351319, and resolve conflicts.
Notes
Notes:
svn path=/projects/clang800-import/; revision=343311
Diffstat (limited to 'contrib/compiler-rt/lib/builtins/arm/aeabi_cdcmp.S')
| -rw-r--r-- | contrib/compiler-rt/lib/builtins/arm/aeabi_cdcmp.S | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/contrib/compiler-rt/lib/builtins/arm/aeabi_cdcmp.S b/contrib/compiler-rt/lib/builtins/arm/aeabi_cdcmp.S index 87dd03dce94d..adc2d55d90f5 100644 --- a/contrib/compiler-rt/lib/builtins/arm/aeabi_cdcmp.S +++ b/contrib/compiler-rt/lib/builtins/arm/aeabi_cdcmp.S @@ -55,7 +55,7 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_cdcmpeq) mov ip, #APSR_C msr APSR_nzcvq, ip #else - msr CPSR_f, #APSR_C + msr APSR_nzcvq, #APSR_C #endif JMP(lr) #endif @@ -115,11 +115,7 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_cdcmple) movne ip, #(APSR_C) 1: -#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) msr APSR_nzcvq, ip -#else - msr CPSR_f, ip -#endif pop {r0-r3} POP_PC() #endif |