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 | |
| 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
| -rw-r--r-- | lib/builtins/arm/aeabi_cdcmp.S | 2 | ||||
| -rw-r--r-- | lib/builtins/arm/aeabi_cfcmp.S | 2 | ||||
| -rw-r--r-- | lib/builtins/assembly.h | 9 |
3 files changed, 4 insertions, 9 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 diff --git a/lib/builtins/assembly.h b/lib/builtins/assembly.h index 3f5e59b25..58116114a 100644 --- a/lib/builtins/assembly.h +++ b/lib/builtins/assembly.h @@ -75,7 +75,7 @@ * - for '-mthumb -march=armv7' compiler defines '__thumb__' and '__thumb2__' */ #if defined(__thumb2__) || defined(__thumb__) -#define DEFINE_CODE_STATE .thumb SEPARATOR +#define DEFINE_CODE_STATE .thumb #define DECLARE_FUNC_ENCODING .thumb_func SEPARATOR #if defined(__thumb2__) #define USE_THUMB_2 @@ -89,7 +89,7 @@ #define ITE(cond) #endif // defined(__thumb__2) #else // !defined(__thumb2__) && !defined(__thumb__) -#define DEFINE_CODE_STATE .arm SEPARATOR +#define DEFINE_CODE_STATE .arm #define DECLARE_FUNC_ENCODING #define IT(cond) #define ITT(cond) @@ -132,7 +132,6 @@ #endif #else // !defined(__arm) #define DECLARE_FUNC_ENCODING -#define DEFINE_CODE_STATE #endif #define GLUE2(a, b) a##b @@ -147,7 +146,6 @@ #endif #define DEFINE_COMPILERRT_FUNCTION(name) \ - DEFINE_CODE_STATE \ FILE_LEVEL_DIRECTIVE SEPARATOR \ .globl SYMBOL_NAME(name) SEPARATOR \ SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ @@ -156,7 +154,6 @@ SYMBOL_NAME(name): #define DEFINE_COMPILERRT_THUMB_FUNCTION(name) \ - DEFINE_CODE_STATE \ FILE_LEVEL_DIRECTIVE SEPARATOR \ .globl SYMBOL_NAME(name) SEPARATOR \ SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ @@ -165,7 +162,6 @@ SYMBOL_NAME(name): #define DEFINE_COMPILERRT_PRIVATE_FUNCTION(name) \ - DEFINE_CODE_STATE \ FILE_LEVEL_DIRECTIVE SEPARATOR \ .globl SYMBOL_NAME(name) SEPARATOR \ SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ @@ -174,7 +170,6 @@ SYMBOL_NAME(name): #define DEFINE_COMPILERRT_PRIVATE_FUNCTION_UNMANGLED(name) \ - DEFINE_CODE_STATE \ .globl name SEPARATOR \ SYMBOL_IS_FUNC(name) SEPARATOR \ HIDDEN(name) SEPARATOR \ |