summaryrefslogtreecommitdiff
path: root/libcpu/arm
diff options
context:
space:
mode:
authorOuxiaolong <[email protected]>2022-01-09 12:39:51 +0800
committerOuxiaolong <[email protected]>2022-01-09 12:39:51 +0800
commitecba17963ca12e568511edfc056c34720de000b3 (patch)
tree82f44220b5498df4270bd1652360863d583fb69a /libcpu/arm
parentdafa934443fa34137217bf9dd59f486946fa4c1e (diff)
parent10a963b955f1f5c7333c4f1668dd20ff27283e85 (diff)
Merge branch 'master' of github.com:Ouxiaolong/rt-thread
Diffstat (limited to 'libcpu/arm')
-rw-r--r--libcpu/arm/cortex-m3/cpuport.c2
-rw-r--r--libcpu/arm/cortex-m33/cpuport.c4
-rw-r--r--libcpu/arm/cortex-m33/trustzone.c2
-rw-r--r--libcpu/arm/cortex-m4/cpuport.c4
-rw-r--r--libcpu/arm/cortex-m7/cpuport.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/libcpu/arm/cortex-m3/cpuport.c b/libcpu/arm/cortex-m3/cpuport.c
index d376f00424..66e2aa4809 100644
--- a/libcpu/arm/cortex-m3/cpuport.c
+++ b/libcpu/arm/cortex-m3/cpuport.c
@@ -385,7 +385,7 @@ __asm int __rt_ffs(int value)
exit
BX lr
}
-#elif defined(__CLANG_ARM)
+#elif defined(__clang__)
int __rt_ffs(int value)
{
__asm volatile(
diff --git a/libcpu/arm/cortex-m33/cpuport.c b/libcpu/arm/cortex-m33/cpuport.c
index aa2325012c..71e1fea848 100644
--- a/libcpu/arm/cortex-m33/cpuport.c
+++ b/libcpu/arm/cortex-m33/cpuport.c
@@ -20,7 +20,7 @@
#include <rtthread.h>
#if /* ARMCC */ ( (defined ( __CC_ARM ) && defined ( __TARGET_FPU_VFP )) \
- /* Clang */ || (defined ( __CLANG_ARM ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) \
+ /* Clang */ || (defined ( __clang__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) \
/* IAR */ || (defined ( __ICCARM__ ) && defined ( __ARMVFP__ )) \
/* GNU */ || (defined ( __GNUC__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) )
#define USE_FPU 1
@@ -472,7 +472,7 @@ __asm int __rt_ffs(int value)
exit
BX lr
}
-#elif defined(__CLANG_ARM)
+#elif defined(__clang__)
int __rt_ffs(int value)
{
if (value == 0) return value;
diff --git a/libcpu/arm/cortex-m33/trustzone.c b/libcpu/arm/cortex-m33/trustzone.c
index f49f0c24f8..2cc19a06e4 100644
--- a/libcpu/arm/cortex-m33/trustzone.c
+++ b/libcpu/arm/cortex-m33/trustzone.c
@@ -37,7 +37,7 @@ static __inline rt_uint32_t __get_IPSR(void)
register rt_uint32_t result __asm("ipsr");
return(result);
}
-#elif defined(__CLANG_ARM)
+#elif defined(__clang__)
__attribute__((always_inline)) static __inline rt_uint32_t __get_IPSR(void)
{
rt_uint32_t result;
diff --git a/libcpu/arm/cortex-m4/cpuport.c b/libcpu/arm/cortex-m4/cpuport.c
index f24c33cf4d..6b748255c5 100644
--- a/libcpu/arm/cortex-m4/cpuport.c
+++ b/libcpu/arm/cortex-m4/cpuport.c
@@ -20,7 +20,7 @@
#include <rtthread.h>
#if /* ARMCC */ ( (defined ( __CC_ARM ) && defined ( __TARGET_FPU_VFP )) \
- /* Clang */ || (defined ( __CLANG_ARM ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) \
+ /* Clang */ || (defined ( __clang__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) \
/* IAR */ || (defined ( __ICCARM__ ) && defined ( __ARMVFP__ )) \
/* GNU */ || (defined ( __GNUC__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) )
#define USE_FPU 1
@@ -469,7 +469,7 @@ __asm int __rt_ffs(int value)
exit
BX lr
}
-#elif defined(__CLANG_ARM)
+#elif defined(__clang__)
int __rt_ffs(int value)
{
__asm volatile(
diff --git a/libcpu/arm/cortex-m7/cpuport.c b/libcpu/arm/cortex-m7/cpuport.c
index f24c33cf4d..6b748255c5 100644
--- a/libcpu/arm/cortex-m7/cpuport.c
+++ b/libcpu/arm/cortex-m7/cpuport.c
@@ -20,7 +20,7 @@
#include <rtthread.h>
#if /* ARMCC */ ( (defined ( __CC_ARM ) && defined ( __TARGET_FPU_VFP )) \
- /* Clang */ || (defined ( __CLANG_ARM ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) \
+ /* Clang */ || (defined ( __clang__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) \
/* IAR */ || (defined ( __ICCARM__ ) && defined ( __ARMVFP__ )) \
/* GNU */ || (defined ( __GNUC__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) )
#define USE_FPU 1
@@ -469,7 +469,7 @@ __asm int __rt_ffs(int value)
exit
BX lr
}
-#elif defined(__CLANG_ARM)
+#elif defined(__clang__)
int __rt_ffs(int value)
{
__asm volatile(