From 7891bb2f67db9aafe187b3b86056e3b4c77f524b Mon Sep 17 00:00:00 2001 From: zmmfly Date: Sun, 22 Mar 2020 13:01:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=5F=5FCLANG=5FARM?= =?UTF-8?q?=E5=88=A4=E6=96=ADAC6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cm_backtrace/cm_backtrace.c | 2 +- cm_backtrace/cmb_def.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cm_backtrace/cm_backtrace.c b/cm_backtrace/cm_backtrace.c index 8a4854c..9038b06 100644 --- a/cm_backtrace/cm_backtrace.c +++ b/cm_backtrace/cm_backtrace.c @@ -35,7 +35,7 @@ #error "must be C99 or higher. try to add '-std=c99' to compile parameters" #endif -#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6120001)) +#if defined(__CC_ARM) || defined(__CLANG_ARM) #define SECTION_START(_name_) _name_##$$Base #define SECTION_END(_name_) _name_##$$Limit #define IMAGE_SECTION_START(_name_) Image$$##_name_##$$Base diff --git a/cm_backtrace/cmb_def.h b/cm_backtrace/cmb_def.h index e21ce87..c381f22 100644 --- a/cm_backtrace/cmb_def.h +++ b/cm_backtrace/cmb_def.h @@ -60,7 +60,7 @@ #endif -#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6120001)) +#if defined(__CC_ARM) || defined(__CLANG_ARM) /* C stack block name, default is STACK */ #ifndef CMB_CSTACK_BLOCK_NAME #define CMB_CSTACK_BLOCK_NAME STACK @@ -271,7 +271,7 @@ if (!(EXPR)) \ } /* ELF(Executable and Linking Format) file extension name for each compiler */ -#if defined(__CC_ARM) +#if defined(__CC_ARM) || defined(__CLANG_ARM) #define CMB_ELF_FILE_EXTENSION_NAME ".axf" #elif defined(__ICCARM__) #define CMB_ELF_FILE_EXTENSION_NAME ".out" @@ -312,7 +312,7 @@ if (!(EXPR)) \ #endif /* (defined(CMB_USING_BARE_METAL_PLATFORM) && defined(CMB_USING_OS_PLATFORM)) */ /* include or export for supported cmb_get_msp, cmb_get_psp and cmb_get_sp function */ -#if defined(__CC_ARM) +#if defined(__CC_ARM) || defined(__CLANG_ARM) static __inline __asm uint32_t cmb_get_msp(void) { mrs r0, msp bx lr