From 2d7fdbdd65cc239a1ab5d86171161dc79a9c3420 Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Mon, 15 Aug 2022 10:38:16 -0400
Subject: [PATCH] =?UTF-8?q?[armclang]=20=E4=BD=BF=E7=94=A8=5F=5Fclang=5F?=
 =?UTF-8?q?=5F=E4=BB=A3=E6=9B=BF=5F=5FCLANG=5FARM=20attach=20https://githu?=
 =?UTF-8?q?b.com/RT-Thread/rt-thread/pull/5451?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bsp/Vango/v85xxp/drivers/board.h          | 2 +-
 bsp/imxrt/imxrt1021-nxp-evk/board/board.h | 2 +-
 bsp/microchip/samc21/board/board.c        | 2 +-
 bsp/microchip/samc21/board/board.h        | 2 +-
 bsp/microchip/same54/board/board.c        | 2 +-
 bsp/microchip/same54/board/board.h        | 2 +-
 bsp/microchip/same70/board/board.c        | 2 +-
 bsp/microchip/same70/board/board.h        | 2 +-
 bsp/microchip/saml10/board/board.c        | 2 +-
 bsp/microchip/saml10/board/board.h        | 2 +-
 bsp/wch/arm/ch579m/board/board.h          | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bsp/Vango/v85xxp/drivers/board.h b/bsp/Vango/v85xxp/drivers/board.h
index 00e546049ed..e7263e4d35a 100644
--- a/bsp/Vango/v85xxp/drivers/board.h
+++ b/bsp/Vango/v85xxp/drivers/board.h
@@ -19,7 +19,7 @@
 #define V85XX_SRAM_END          (0x20000000 + V85XX_SRAM_SIZE * 1024)
 
 
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN  (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/board.h b/bsp/imxrt/imxrt1021-nxp-evk/board/board.h
index 8cbebccbf87..49aa4f17b81 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/board.h
+++ b/bsp/imxrt/imxrt1021-nxp-evk/board/board.h
@@ -15,7 +15,7 @@
 #include "fsl_common.h"
 #include "clock_config.h"
 #define SOC_IMXRT1020_SERIES
-#if defined(__CC_ARM) || defined (__CLANG_ARM) || defined (__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
 extern int Image$$RTT_HEAP$$ZI$$Base;
 extern int Image$$RTT_HEAP$$ZI$$Limit;
 #define HEAP_BEGIN          (&Image$$RTT_HEAP$$ZI$$Base)
diff --git a/bsp/microchip/samc21/board/board.c b/bsp/microchip/samc21/board/board.c
index cc49de728eb..e16a5357da9 100644
--- a/bsp/microchip/samc21/board/board.c
+++ b/bsp/microchip/samc21/board/board.c
@@ -73,7 +73,7 @@ void rt_hw_board_init(void)
     NVIC_SetPriority(PendSV_IRQn, (1 << __NVIC_PRIO_BITS) - 1);
 
 #ifdef RT_USING_HEAP
-    #if defined(__CC_ARM) || defined(__CLANG_ARM)
+    #if defined(__ARMCC_VERSION)
         rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)HEAP_END);
     #elif __ICCARM__
         rt_system_heap_init((void*)HEAP_BEGIN, (void*)HEAP_END);
diff --git a/bsp/microchip/samc21/board/board.h b/bsp/microchip/samc21/board/board.h
index 6de1e3f6e1a..5451d042969 100644
--- a/bsp/microchip/samc21/board/board.h
+++ b/bsp/microchip/samc21/board/board.h
@@ -46,7 +46,7 @@
 
 #define SAMC21_SRAM_END        (0x20000000 + SAMC21_SRAM_SIZE * 1024)
 
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/microchip/same54/board/board.c b/bsp/microchip/same54/board/board.c
index bd620e6e311..4144d0255f0 100644
--- a/bsp/microchip/same54/board/board.c
+++ b/bsp/microchip/same54/board/board.c
@@ -75,7 +75,7 @@ void rt_hw_board_init(void)
     NVIC_SetPriority(PendSV_IRQn, (1 << __NVIC_PRIO_BITS) - 1);
 
 #ifdef RT_USING_HEAP
-    #if defined(__CC_ARM) || defined(__CLANG_ARM)
+    #if defined(__ARMCC_VERSION)
         rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)HEAP_END);
     #elif __ICCARM__
         rt_system_heap_init((void*)HEAP_BEGIN, (void*)HEAP_END);
diff --git a/bsp/microchip/same54/board/board.h b/bsp/microchip/same54/board/board.h
index e0bf12cb839..fd504669b0e 100644
--- a/bsp/microchip/same54/board/board.h
+++ b/bsp/microchip/same54/board/board.h
@@ -60,7 +60,7 @@
 
 #define SAME5x_SRAM_END      (0x20000000 + SAME5x_SRAM_SIZE * 1024)
 
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/microchip/same70/board/board.c b/bsp/microchip/same70/board/board.c
index 00f9874edb0..4cb47179ba8 100644
--- a/bsp/microchip/same70/board/board.c
+++ b/bsp/microchip/same70/board/board.c
@@ -78,7 +78,7 @@ void rt_hw_board_init(void)
     NVIC_SetPriority(PendSV_IRQn, (1 << __NVIC_PRIO_BITS) - 1);
 
 #ifdef RT_USING_HEAP
-    #if defined(__CC_ARM) || defined(__CLANG_ARM)
+    #if defined(__ARMCC_VERSION)
         rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)HEAP_END);
     #elif __ICCARM__
         rt_system_heap_init((void*)HEAP_BEGIN, (void*)HEAP_END);
diff --git a/bsp/microchip/same70/board/board.h b/bsp/microchip/same70/board/board.h
index 2f5027c041b..0b32541180a 100644
--- a/bsp/microchip/same70/board/board.h
+++ b/bsp/microchip/same70/board/board.h
@@ -92,7 +92,7 @@
 
 #define SAME70_SRAM_END    (0x20400000 + SAME70_SRAM_SIZE * 1024)
 
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/microchip/saml10/board/board.c b/bsp/microchip/saml10/board/board.c
index cc49de728eb..e16a5357da9 100644
--- a/bsp/microchip/saml10/board/board.c
+++ b/bsp/microchip/saml10/board/board.c
@@ -73,7 +73,7 @@ void rt_hw_board_init(void)
     NVIC_SetPriority(PendSV_IRQn, (1 << __NVIC_PRIO_BITS) - 1);
 
 #ifdef RT_USING_HEAP
-    #if defined(__CC_ARM) || defined(__CLANG_ARM)
+    #if defined(__ARMCC_VERSION)
         rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)HEAP_END);
     #elif __ICCARM__
         rt_system_heap_init((void*)HEAP_BEGIN, (void*)HEAP_END);
diff --git a/bsp/microchip/saml10/board/board.h b/bsp/microchip/saml10/board/board.h
index fbf8042cd9b..a0454e18b50 100644
--- a/bsp/microchip/saml10/board/board.h
+++ b/bsp/microchip/saml10/board/board.h
@@ -30,7 +30,7 @@
 
 #define SAML10_SRAM_END        (0x20000000 + SAML10_SRAM_SIZE * 1024)
 
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/wch/arm/ch579m/board/board.h b/bsp/wch/arm/ch579m/board/board.h
index 81a720aa27c..ded82fa2272 100644
--- a/bsp/wch/arm/ch579m/board/board.h
+++ b/bsp/wch/arm/ch579m/board/board.h
@@ -21,7 +21,7 @@
 #define CH579M_SRAM_SIZE      32
 #define CH579M_SRAM_END       (0x20000000 + CH579M_SRAM_SIZE * 1024)
 
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN      ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__