diff --git a/bsp/Vango_V85xx/drivers/board.h b/bsp/Vango_V85xx/drivers/board.h
index e8e312d1100c45ae89b5cd9138947db6156133df..837f195b9e262826d0c92312c9760bb480a5e03a 100644
--- a/bsp/Vango_V85xx/drivers/board.h
+++ b/bsp/Vango_V85xx/drivers/board.h
@@ -21,7 +21,7 @@
#define V85XX_SRAM_SIZE 32
#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 ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
#elif __ICCARM__
diff --git a/bsp/acm32f0x0-nucleo/drivers/board.c b/bsp/acm32f0x0-nucleo/drivers/board.c
index 28e8b773229a569fa210f78c166ebcccd19c8861..841560184e17c521f2fd0a9bc6b06ab7b84f6986 100644
--- a/bsp/acm32f0x0-nucleo/drivers/board.c
+++ b/bsp/acm32f0x0-nucleo/drivers/board.c
@@ -18,7 +18,7 @@
extern int rt_application_init(void);
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
extern int Image$$RW_IRAM1$$ZI$$Limit;
#elif __ICCARM__
#pragma section="HEAP"
@@ -58,7 +58,7 @@ void rt_hw_board_init(void)
rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
#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 *)SOC_SRAM_END_ADDR);
#elif __ICCARM__
rt_system_heap_init(__segment_end("HEAP"), (void *)SOC_SRAM_END_ADDR);
diff --git a/bsp/acm32f4xx-nucleo/drivers/board.c b/bsp/acm32f4xx-nucleo/drivers/board.c
index 050db7656bc63c7265ab5ce87c2fa9dbe84c18d8..202a0371da3f9f7275665165c42f6cbe2a21b5f5 100644
--- a/bsp/acm32f4xx-nucleo/drivers/board.c
+++ b/bsp/acm32f4xx-nucleo/drivers/board.c
@@ -17,7 +17,7 @@
extern int rt_application_init(void);
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
extern int Image$$RW_IRAM1$$ZI$$Limit;
#elif __ICCARM__
#pragma section="HEAP"
@@ -57,7 +57,7 @@ void rt_hw_board_init(void)
rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
#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 *)SOC_SRAM_END_ADDR);
#elif __ICCARM__
rt_system_heap_init(__segment_end("HEAP"), (void *)SOC_SRAM_END_ADDR);
diff --git a/bsp/apm32/apm32f103xe-minibroard/board/board.h b/bsp/apm32/apm32f103xe-minibroard/board/board.h
index da63a219953fc3aa6fc889af7930feca6c5d70a9..b2f4773b2622193e61397cfd6e0152e8d1471827 100644
--- a/bsp/apm32/apm32f103xe-minibroard/board/board.h
+++ b/bsp/apm32/apm32f103xe-minibroard/board/board.h
@@ -36,7 +36,7 @@ extern "C" {
#define APM32_SRAM_SIZE 128
#define APM32_SRAM_END (0x20000000 + APM32_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__
diff --git a/bsp/at32/at32f403a-start/board/board.h b/bsp/at32/at32f403a-start/board/board.h
index 1f2a4f3f3ccd14074097f72b70b778e4c33293df..762b087a7ca5bfcdd216295f97adcb2fec9c4655 100644
--- a/bsp/at32/at32f403a-start/board/board.h
+++ b/bsp/at32/at32f403a-start/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define AT32_SRAM_SIZE 96
#define AT32_SRAM_END (0x20000000 + AT32_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__
diff --git a/bsp/at32/at32f407-start/board/board.h b/bsp/at32/at32f407-start/board/board.h
index 1f2a4f3f3ccd14074097f72b70b778e4c33293df..762b087a7ca5bfcdd216295f97adcb2fec9c4655 100644
--- a/bsp/at32/at32f407-start/board/board.h
+++ b/bsp/at32/at32f407-start/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define AT32_SRAM_SIZE 96
#define AT32_SRAM_END (0x20000000 + AT32_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__
diff --git a/bsp/essemi/es32f0654/drivers/board.h b/bsp/essemi/es32f0654/drivers/board.h
index 73ca6c11dea179a5c1a854f023ac8d79c5d13bc5..c187b82b247200318c97dfbbe5d171ab6f522ca0 100644
--- a/bsp/essemi/es32f0654/drivers/board.h
+++ b/bsp/essemi/es32f0654/drivers/board.h
@@ -31,7 +31,7 @@
#define ES32F0_SRAM_SIZE 0x8000
#define ES32F0_SRAM_END (0x20000000 + ES32F0_SRAM_SIZE)
-#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__
diff --git a/bsp/essemi/es32f365x/drivers/board.h b/bsp/essemi/es32f365x/drivers/board.h
index 796121513a3f14e27762b202eba393639ade700a..34ee8b1c383fb671f9cad24e7ff327020f94a3ab 100644
--- a/bsp/essemi/es32f365x/drivers/board.h
+++ b/bsp/essemi/es32f365x/drivers/board.h
@@ -30,7 +30,7 @@
#define ES32F3_SRAM_SIZE 0x10000
#define ES32F3_SRAM_END (0x20000000 + ES32F3_SRAM_SIZE)
-#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__
diff --git a/bsp/essemi/es32f369x/drivers/board.h b/bsp/essemi/es32f369x/drivers/board.h
index 971216e9a941c4593dda88cd85297544156e008a..871ab7436e355bfa4e51e7ddfffc6115ef1b89f6 100644
--- a/bsp/essemi/es32f369x/drivers/board.h
+++ b/bsp/essemi/es32f369x/drivers/board.h
@@ -31,7 +31,7 @@
#define ES32F3_SRAM_SIZE 0x18000
#define ES32F3_SRAM_END (0x20000000 + ES32F3_SRAM_SIZE)
-#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__
diff --git a/bsp/gd32e230k-start/drivers/board.h b/bsp/gd32e230k-start/drivers/board.h
index 7d491aeaa830337be560989484e6a698b1e7a5aa..c76f570768a1d3ac620e0987943326cb3275c041 100644
--- a/bsp/gd32e230k-start/drivers/board.h
+++ b/bsp/gd32e230k-start/drivers/board.h
@@ -25,7 +25,7 @@ extern char __ICFEDIT_region_RAM_end__;
#define GD32_SRAM_END (0x20000000 + GD32_SRAM_SIZE * 1024)
#endif
-#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/hk32/hk32f030c8-mini/board/board.h b/bsp/hk32/hk32f030c8-mini/board/board.h
index 6e6d0d4f5c3c7f38eb6256884b2af726e2695082..b0b3752ee1651b4d4a3584dbb8b5c77ca4504ec6 100644
--- a/bsp/hk32/hk32f030c8-mini/board/board.h
+++ b/bsp/hk32/hk32f030c8-mini/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define HK32_SRAM_SIZE 10
#define HK32_SRAM_END (0x20000000 + HK32_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__
diff --git a/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/main.c b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/main.c
index ef4393ba39013e8828fb69f0abe9f536e93312c0..d9a8b55a1b7963fda5ff84b5bf50e9364051dff1 100644
--- a/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/main.c
+++ b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/main.c
@@ -20,7 +20,7 @@ int main(void)
{
#if defined(__CC_ARM)
rt_kprintf("using armcc, version: %d\n", __ARMCC_VERSION);
-#elif defined(__CLANG_ARM)
+#elif defined(__clang__)
rt_kprintf("using armclang, version: %d\n", __ARMCC_VERSION);
#elif defined(__ICCARM__)
rt_kprintf("using iccarm, version: %d\n", __VER__);
diff --git a/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/board/board.h b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/board/board.h
index 1899798c13d1d692cfcb259a2ce43a7c6def0c3c..20c46767d1f50ca6602a689b870f70658c97168d 100644
--- a/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/board/board.h
+++ b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/board/board.h
@@ -29,7 +29,7 @@
//
//
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
extern int Image$$ARM_LIB_HEAP$$ZI$$Base;
#define HEAP_BEGIN ((void *)&Image$$ARM_LIB_HEAP$$ZI$$Base)
#elif defined(__ICCARM__)
diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/main.c b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/main.c
index 7a368dcd548893d94a0b25750e0a369daaad452f..3dd5d599dc8a337cc8cd3e23064cff230959e34f 100644
--- a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/main.c
+++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/main.c
@@ -24,7 +24,7 @@ int main(void)
{
#if defined(__CC_ARM)
rt_kprintf("using armcc, version: %d\n", __ARMCC_VERSION);
-#elif defined(__CLANG_ARM)
+#elif defined(__clang__)
rt_kprintf("using armclang, version: %d\n", __ARMCC_VERSION);
#elif defined(__ICCARM__)
rt_kprintf("using iccarm, version: %d\n", __VER__);
diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.h b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.h
index 7500557fcba335e75df595360255523fdf331718..bdda20fbb4852a8b78eb76b5732ff056b28ff8da 100644
--- a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.h
+++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.h
@@ -29,7 +29,7 @@
//
//
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
extern int Image$$ARM_LIB_HEAP$$ZI$$Base;
extern int Image$$ARM_LIB_STACK$$ZI$$Base;
#define HEAP_BEGIN ((void *)&Image$$ARM_LIB_HEAP$$ZI$$Base)
diff --git a/bsp/maxim/MAX32660_EVSYS/board/board.h b/bsp/maxim/MAX32660_EVSYS/board/board.h
index 490e91a95f20143f631c781d7939a9672184d5f1..093bb86ad8f55fda7efd633c24166fe87a468b28 100644
--- a/bsp/maxim/MAX32660_EVSYS/board/board.h
+++ b/bsp/maxim/MAX32660_EVSYS/board/board.h
@@ -26,7 +26,7 @@
#define MCU_SRAM_START (0x20000000)
#define MCU_SRAM_END (MCU_SRAM_START + MCU_SRAM_SIZE_KB * 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__
diff --git a/bsp/mm32l07x/drivers/board.h b/bsp/mm32l07x/drivers/board.h
index cfc02d288e890e21341f25c26da9424b57a2fbaf..fc2da93b0ee797bbeadd5070b1dd0dd3d1652fa7 100644
--- a/bsp/mm32l07x/drivers/board.h
+++ b/bsp/mm32l07x/drivers/board.h
@@ -16,7 +16,7 @@
#define SRAM_SIZE 0x2000
#define SRAM_END (SRAM_BASE + SRAM_SIZE)
-#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__
diff --git a/bsp/n32g452xx/n32g452xx-mini-system/board/board.h b/bsp/n32g452xx/n32g452xx-mini-system/board/board.h
index 71f5ca48a08debf80cc2eb817d86cf061833b0ee..0a3b0fa66194a191c1737636ffa33f8bc4eb613d 100644
--- a/bsp/n32g452xx/n32g452xx-mini-system/board/board.h
+++ b/bsp/n32g452xx/n32g452xx-mini-system/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define N32_SRAM_SIZE (80)
#define N32_SRAM_END (0x20000000 + N32_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__
diff --git a/bsp/nrf5x/libraries/templates/nrfx/board/board.h b/bsp/nrf5x/libraries/templates/nrfx/board/board.h
index 52e812fac66626aa58a71c36aefe13ef1a34ae99..26543f7f6fa284241b34f02b21203abfbe462312 100644
--- a/bsp/nrf5x/libraries/templates/nrfx/board/board.h
+++ b/bsp/nrf5x/libraries/templates/nrfx/board/board.h
@@ -20,7 +20,7 @@
#define MCU_SRAM_SIZE MCU_SRAM_SIZE_KB*1024
#define MCU_SRAM_END_ADDRESS (MCU_SRAM_START_ADDRESS + MCU_SRAM_SIZE)
-#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__
diff --git a/bsp/nrf5x/nrf51822/board/board.h b/bsp/nrf5x/nrf51822/board/board.h
index a3ccadfa36fe95b44575f8c278f8154115defd59..f2bbf90e79535af16637e311ffda7f6c3bc91975 100644
--- a/bsp/nrf5x/nrf51822/board/board.h
+++ b/bsp/nrf5x/nrf51822/board/board.h
@@ -10,7 +10,7 @@
#define MCU_SRAM_SIZE MCU_SRAM_SIZE_KB*1024
#define MCU_SRAM_END_ADDRESS (MCU_SRAM_START_ADDRESS + MCU_SRAM_SIZE)
-#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__
diff --git a/bsp/nrf5x/nrf52832/board/board.h b/bsp/nrf5x/nrf52832/board/board.h
index 32acd6b56cfe8bbca66213b3f319e3ea00accc06..2b556fb6e683b98c07277e8d10aea783080896d6 100644
--- a/bsp/nrf5x/nrf52832/board/board.h
+++ b/bsp/nrf5x/nrf52832/board/board.h
@@ -10,7 +10,7 @@
#define MCU_SRAM_SIZE MCU_SRAM_SIZE_KB*1024
#define MCU_SRAM_END_ADDRESS (MCU_SRAM_START_ADDRESS + MCU_SRAM_SIZE)
-#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__
diff --git a/bsp/nrf5x/nrf52833/board/board.h b/bsp/nrf5x/nrf52833/board/board.h
index 52e812fac66626aa58a71c36aefe13ef1a34ae99..26543f7f6fa284241b34f02b21203abfbe462312 100644
--- a/bsp/nrf5x/nrf52833/board/board.h
+++ b/bsp/nrf5x/nrf52833/board/board.h
@@ -20,7 +20,7 @@
#define MCU_SRAM_SIZE MCU_SRAM_SIZE_KB*1024
#define MCU_SRAM_END_ADDRESS (MCU_SRAM_START_ADDRESS + MCU_SRAM_SIZE)
-#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__
diff --git a/bsp/nrf5x/nrf52840/board/board.h b/bsp/nrf5x/nrf52840/board/board.h
index edfb0b635a8c3ed21ba083de9f8238ef6947084a..533a45156eaf0561faf074af8def89a8618427bf 100644
--- a/bsp/nrf5x/nrf52840/board/board.h
+++ b/bsp/nrf5x/nrf52840/board/board.h
@@ -20,7 +20,7 @@
#define MCU_SRAM_SIZE MCU_SRAM_SIZE_KB*1024
#define MCU_SRAM_END_ADDRESS (MCU_SRAM_START_ADDRESS + MCU_SRAM_SIZE)
-#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__
diff --git a/bsp/nuvoton/numaker-iot-m487/board/board.h b/bsp/nuvoton/numaker-iot-m487/board/board.h
index cd45f65e7609cf899c350bcbb619288377801ed8..60515faf35c44a84102f5aaa6814670826932fd0 100644
--- a/bsp/nuvoton/numaker-iot-m487/board/board.h
+++ b/bsp/nuvoton/numaker-iot-m487/board/board.h
@@ -17,7 +17,7 @@
#define SRAM_SIZE (160)
#define SRAM_END (0x20000000 + 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__
diff --git a/bsp/nuvoton/numaker-m032ki/board/board.h b/bsp/nuvoton/numaker-m032ki/board/board.h
index acdd559291dc9f9fc63cdfeb79299cfa9dcd2023..bc6fc79f82dc541bd076ad3484257b999d04ecbe 100644
--- a/bsp/nuvoton/numaker-m032ki/board/board.h
+++ b/bsp/nuvoton/numaker-m032ki/board/board.h
@@ -17,7 +17,7 @@
#define SRAM_SIZE (96)
#define SRAM_END (0x20000000 + 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__
diff --git a/bsp/nuvoton/numaker-m2354/board/board.h b/bsp/nuvoton/numaker-m2354/board/board.h
index e783166fef028be6543a6b3ea62cb8d4585859d8..c28c4ee36a3f85d3f7f9cff8def43203b3eee8ad 100644
--- a/bsp/nuvoton/numaker-m2354/board/board.h
+++ b/bsp/nuvoton/numaker-m2354/board/board.h
@@ -17,7 +17,7 @@
#define SRAM_SIZE (256)
#define SRAM_END (0x20000000 + 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__
diff --git a/bsp/nuvoton/numaker-pfm-m487/board/board.h b/bsp/nuvoton/numaker-pfm-m487/board/board.h
index cd45f65e7609cf899c350bcbb619288377801ed8..60515faf35c44a84102f5aaa6814670826932fd0 100644
--- a/bsp/nuvoton/numaker-pfm-m487/board/board.h
+++ b/bsp/nuvoton/numaker-pfm-m487/board/board.h
@@ -17,7 +17,7 @@
#define SRAM_SIZE (160)
#define SRAM_END (0x20000000 + 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__
diff --git a/bsp/samd21/applications/startup.c b/bsp/samd21/applications/startup.c
index ecbe617d2e1d2d2739f0680dfdc45cfc9104dc0a..0a689a9e743118128c55593c78c0986c07823ba1 100644
--- a/bsp/samd21/applications/startup.c
+++ b/bsp/samd21/applications/startup.c
@@ -29,7 +29,7 @@ extern void finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
extern int Image$$RW_IRAM1$$ZI$$Limit;
#elif __ICCARM__
#pragma section="HEAP"
@@ -72,7 +72,7 @@ void rtthread_startup(void)
rt_system_timer_init();
#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*)CHIP_SRAM_END);
#elif __ICCARM__
rt_system_heap_init(__segment_end("HEAP"), (void*)CHIP_SRAM_END);
diff --git a/bsp/stm32/libraries/templates/stm32f0xx/board/board.h b/bsp/stm32/libraries/templates/stm32f0xx/board/board.h
index fbc2af5ebeb2dca6046f542858b26d890f68aa18..557856de3701b0f497ddbfd887f6db59a1f1161a 100644
--- a/bsp/stm32/libraries/templates/stm32f0xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32f0xx/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 32
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/libraries/templates/stm32f10x/board/board.h b/bsp/stm32/libraries/templates/stm32f10x/board/board.h
index fc435ee0299e6d3681d5bc3b533cf0d1ddeea03e..a6aa7d66542c0b14740269de23243fbefce51641 100644
--- a/bsp/stm32/libraries/templates/stm32f10x/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32f10x/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 20
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/libraries/templates/stm32f2xx/board/board.h b/bsp/stm32/libraries/templates/stm32f2xx/board/board.h
index b93a301f4e5f02932aa03e77dec1925204845824..6d0c5e53b60ac9efabd1b2a36fed233cb338ff18 100644
--- a/bsp/stm32/libraries/templates/stm32f2xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32f2xx/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 128
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/libraries/templates/stm32f3xx/board/board.h b/bsp/stm32/libraries/templates/stm32f3xx/board/board.h
index 1de41e4a63f277a3dfce0eb1c26aff81e085e1c1..de61eb75141e443945b00fc3bae2c25354bdfa70 100644
--- a/bsp/stm32/libraries/templates/stm32f3xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32f3xx/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 16
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/libraries/templates/stm32f4xx/board/board.h b/bsp/stm32/libraries/templates/stm32f4xx/board/board.h
index 514155b823a24d280f112a91e9aff45bfdd3eb4a..50bf01a1ca852c16c5a5094028fff736cfc2b8ea 100644
--- a/bsp/stm32/libraries/templates/stm32f4xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32f4xx/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 128
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/libraries/templates/stm32f7xx/board/board.h b/bsp/stm32/libraries/templates/stm32f7xx/board/board.h
index 2951235675fdaeb5177fcf18d3935649be9adf3f..a02fbca511ece915d5b5b9c59f5f87e63dff4408 100644
--- a/bsp/stm32/libraries/templates/stm32f7xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32f7xx/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE (512)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/libraries/templates/stm32h7xx/board/board.h b/bsp/stm32/libraries/templates/stm32h7xx/board/board.h
index 72d84ff29d1461efe2dc812b1d7fe3bfce559fa5..9c856893decb9ae99de54cfe0d360bd70702c826 100644
--- a/bsp/stm32/libraries/templates/stm32h7xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32h7xx/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE (512)
#define STM32_SRAM_END (0x24000000 + STM32_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/stm32/libraries/templates/stm32l1xx/board/board.h b/bsp/stm32/libraries/templates/stm32l1xx/board/board.h
index f6cfb3522bbeb11609e31c139c48c5ac10b0f50a..01696fe3c5ea28f226a4e9d9f168d79e3fbf2d2f 100644
--- a/bsp/stm32/libraries/templates/stm32l1xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32l1xx/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 16
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/libraries/templates/stm32l4xx/board/board.h b/bsp/stm32/libraries/templates/stm32l4xx/board/board.h
index b5120ac47659b6cdcbfd1976490e3d9153906559..a2555c2b6fc6f8f10b415c43ac434da7df96b4d3 100644
--- a/bsp/stm32/libraries/templates/stm32l4xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32l4xx/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/stm32/libraries/templates/stm32l5xx/board/board.h b/bsp/stm32/libraries/templates/stm32l5xx/board/board.h
index 049dfd05fb2cf3ba5ed95b8355d56e7e63743b8a..479a4262fb50748ea31aa18ba61b9fc618e1b7ab 100644
--- a/bsp/stm32/libraries/templates/stm32l5xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32l5xx/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/stm32/libraries/templates/stm32mp1xx/board/board.h b/bsp/stm32/libraries/templates/stm32mp1xx/board/board.h
index b23b83ee30489012ee501e9208203ae609857164..ecf4c1a88f4b5c49e63ba0a5779072b6dfcf6905 100644
--- a/bsp/stm32/libraries/templates/stm32mp1xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32mp1xx/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM_SIZE (128)
#define STM32_SRAM_END ((uint32_t)0x10040000 + (STM32_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/stm32/libraries/templates/stm32wbxx/board/board.h b/bsp/stm32/libraries/templates/stm32wbxx/board/board.h
index d77bf172bab38ec2315b6080f4cfcc9f83ed15f8..6585a352c700a357ddf5673cd021334340f190f8 100644
--- a/bsp/stm32/libraries/templates/stm32wbxx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32wbxx/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/stm32/stm32f072-st-nucleo/board/board.h b/bsp/stm32/stm32f072-st-nucleo/board/board.h
index 51a9f80eddc6dd7f6daf5984a0da6e56157118e5..4dc58c3c9272197287017b9bbfbdbda7648301e9 100644
--- a/bsp/stm32/stm32f072-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f072-st-nucleo/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 16
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f091-st-nucleo/board/board.h b/bsp/stm32/stm32f091-st-nucleo/board/board.h
index a9ba91377df70705792ebd992e53ea232c17eb94..efd152dc0d330070788c9318114ab366ce496bfb 100644
--- a/bsp/stm32/stm32f091-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f091-st-nucleo/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 32
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f103-atk-nano/board/board.h b/bsp/stm32/stm32f103-atk-nano/board/board.h
index 498459073ec73baaafb2eed6f29050121ef54d47..05d7bdaf2d0d8f5835977ae0b58803eb0f42d683 100644
--- a/bsp/stm32/stm32f103-atk-nano/board/board.h
+++ b/bsp/stm32/stm32f103-atk-nano/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 20
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f103-atk-warshipv3/board/board.h b/bsp/stm32/stm32f103-atk-warshipv3/board/board.h
index 80c80984bf988c415857849419657ca0f0cca99b..023339a17721779df94d955e633f3d8d2a0b2b85 100644
--- a/bsp/stm32/stm32f103-atk-warshipv3/board/board.h
+++ b/bsp/stm32/stm32f103-atk-warshipv3/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 64
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f103-blue-pill/board/board.h b/bsp/stm32/stm32f103-blue-pill/board/board.h
index 1be364929a0557180a93e8ed843d85737e6c2696..aaa6eeafc01f10d1146be2bfcda7102d0ec157cf 100644
--- a/bsp/stm32/stm32f103-blue-pill/board/board.h
+++ b/bsp/stm32/stm32f103-blue-pill/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 20
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f103-dofly-M3S/board/board.h b/bsp/stm32/stm32f103-dofly-M3S/board/board.h
index 8662bff0f54e33bd2bf142d6007ade8d20e8456b..8403f451d4704651e76271d4f2f57f2f6b7c0b2e 100644
--- a/bsp/stm32/stm32f103-dofly-M3S/board/board.h
+++ b/bsp/stm32/stm32f103-dofly-M3S/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM_SIZE 64
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f103-dofly-lyc8/board/board.h b/bsp/stm32/stm32f103-dofly-lyc8/board/board.h
index 8d8cc4643ae93ec90bde274493382378030ea312..3d813a0af008a8670a50f9af1b444f73e660b90a 100644
--- a/bsp/stm32/stm32f103-dofly-lyc8/board/board.h
+++ b/bsp/stm32/stm32f103-dofly-lyc8/board/board.h
@@ -23,7 +23,7 @@
#define STM32_SRAM_SIZE 20
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/board.h b/bsp/stm32/stm32f103-fire-arbitrary/board/board.h
index 7aa3c0f703de112605b8602139bd3b46c0c898aa..3cc20b82e4b95fb0156df22352f360212361421d 100644
--- a/bsp/stm32/stm32f103-fire-arbitrary/board/board.h
+++ b/bsp/stm32/stm32f103-fire-arbitrary/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_FLASH_SIZE (512 * 1024)
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
-#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__
diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.h b/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.h
index cdb13091cd1ed9c2793a772dcc0ec80b1c6e236d..6c852d96092d41f8ba5e6575882ffab357f7bc44 100644
--- a/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.h
+++ b/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 20
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f103-hw100k-ibox/board/board.h b/bsp/stm32/stm32f103-hw100k-ibox/board/board.h
index 239f0afdd681be49a16a27f8175c717015e199c0..3dfff3bdb0c9fbf9647f9751aa9428c0e164a282 100644
--- a/bsp/stm32/stm32f103-hw100k-ibox/board/board.h
+++ b/bsp/stm32/stm32f103-hw100k-ibox/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 64
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f103-onenet-nbiot/board/board.h b/bsp/stm32/stm32f103-onenet-nbiot/board/board.h
index 162925a4f31c7e96bc69004ad5e9763d963310dd..2e5f93a0bbcdd67e9a4d4742092da9eb145034ad 100644
--- a/bsp/stm32/stm32f103-onenet-nbiot/board/board.h
+++ b/bsp/stm32/stm32f103-onenet-nbiot/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 64
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f103-yf-ufun/board/board.h b/bsp/stm32/stm32f103-yf-ufun/board/board.h
index 738f37080a9c3cb1b207ca7a1cf7baf614180d11..fa0ff3fed242662cd515730ecbd1d5235119f578 100644
--- a/bsp/stm32/stm32f103-yf-ufun/board/board.h
+++ b/bsp/stm32/stm32f103-yf-ufun/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 48
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f107-uc-eval/board/board.h b/bsp/stm32/stm32f107-uc-eval/board/board.h
index 44a96208c6d5759b8ac1be4edefd9f867f6a9d1c..ce1681ba28f2a610b465a7b375d2b2878e8d1a6d 100644
--- a/bsp/stm32/stm32f107-uc-eval/board/board.h
+++ b/bsp/stm32/stm32f107-uc-eval/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 64
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f207-st-nucleo/board/board.h b/bsp/stm32/stm32f207-st-nucleo/board/board.h
index 77143ecb0eadd792ce3fb66a609e5dea9bede0fd..b7b40bb799810bc772d82b405534c891eb9a19f3 100644
--- a/bsp/stm32/stm32f207-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f207-st-nucleo/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 128
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32f302-st-nucleo/board/board.h b/bsp/stm32/stm32f302-st-nucleo/board/board.h
index 1de41e4a63f277a3dfce0eb1c26aff81e085e1c1..de61eb75141e443945b00fc3bae2c25354bdfa70 100644
--- a/bsp/stm32/stm32f302-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f302-st-nucleo/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 16
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f401-st-nucleo/board/board.h b/bsp/stm32/stm32f401-st-nucleo/board/board.h
index 82647a83a49ed6f7b52f1fee58fad0e07a45f582..93a2407c875b2a0103b7b99b7fa4066201e90cf4 100644
--- a/bsp/stm32/stm32f401-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f401-st-nucleo/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 96
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f405-smdz-breadfruit/board/board.h b/bsp/stm32/stm32f405-smdz-breadfruit/board/board.h
index 844f5e35e63638732d43c061d2b8e18bc039590c..64d30cc5b731c83958aba2faf097e4061ea81bc5 100644
--- a/bsp/stm32/stm32f405-smdz-breadfruit/board/board.h
+++ b/bsp/stm32/stm32f405-smdz-breadfruit/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE (128)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f407-armfly-v5/board/board.h b/bsp/stm32/stm32f407-armfly-v5/board/board.h
index 68016d18bdaa6bab7bdf82ab14d659d3ee9ab655..00108ee123f8f7772dd4a2610ebcca885ac1906b 100644
--- a/bsp/stm32/stm32f407-armfly-v5/board/board.h
+++ b/bsp/stm32/stm32f407-armfly-v5/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 128
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f407-atk-explorer/applications/lvgl/lv_port_disp.c b/bsp/stm32/stm32f407-atk-explorer/applications/lvgl/lv_port_disp.c
index fb38b870ec4d8a37d86a7ea7d394b073973b7519..30da608bdc184e76bd067347cc267d555f75f2c5 100644
--- a/bsp/stm32/stm32f407-atk-explorer/applications/lvgl/lv_port_disp.c
+++ b/bsp/stm32/stm32f407-atk-explorer/applications/lvgl/lv_port_disp.c
@@ -26,7 +26,7 @@ static lv_disp_drv_t disp_drv;
lv_color_t buf_1[LCD_H * LCD_W];
#elif defined ( __CC_ARM ) /* MDK ARM Compiler */
__attribute__((at(0x68000000))) lv_color_t buf_1[LCD_H * LCD_W];
-#elif defined ( __CLANG_ARM ) /* MDK ARM Compiler v6 */
+#elif defined ( __clang__ ) /* MDK ARM Compiler v6 */
__attribute__((section(".ARM.__at_0x68000000"))) lv_color_t buf_1[LCD_H * LCD_W];
#elif defined ( __GNUC__ ) /* GNU Compiler */
lv_color_t buf_1[LCD_H * LCD_W] __attribute__((section(".MCUlcdgrambysram")));
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/board.h b/bsp/stm32/stm32f407-atk-explorer/board/board.h
index 6d80e38f782d4cbeb71016672cd5ceda7691fdf6..b88f85a0643c98c9436b50aed399023e3320eed1 100644
--- a/bsp/stm32/stm32f407-atk-explorer/board/board.h
+++ b/bsp/stm32/stm32f407-atk-explorer/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_FLASH_SIZE (1024 * 1024)
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
-#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__
diff --git a/bsp/stm32/stm32f407-robomaster-c/board/board.h b/bsp/stm32/stm32f407-robomaster-c/board/board.h
index 25e4852c4c16e2a89d988354781dc69250037815..92b95201692d1f06e7858c10216fced1f1a9fcca 100644
--- a/bsp/stm32/stm32f407-robomaster-c/board/board.h
+++ b/bsp/stm32/stm32f407-robomaster-c/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 128
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f407-st-discovery/board/board.h b/bsp/stm32/stm32f407-st-discovery/board/board.h
index 539e3abf45b968d7aa95ee009474c2afa80340cf..ca3b4f8b243411385fe276bf70678fa4249fbc20 100644
--- a/bsp/stm32/stm32f407-st-discovery/board/board.h
+++ b/bsp/stm32/stm32f407-st-discovery/board/board.h
@@ -23,7 +23,7 @@ extern "C" {
#define STM32_SRAM_SIZE (128)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f410-st-nucleo/board/board.h b/bsp/stm32/stm32f410-st-nucleo/board/board.h
index 72bd8a017c03c0e919c240c5e9261389df343c71..122ee1b52448a11feb06b00dd3cda1c19d163eb5 100644
--- a/bsp/stm32/stm32f410-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f410-st-nucleo/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 32
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f411-atk-nano/board/board.h b/bsp/stm32/stm32f411-atk-nano/board/board.h
index 2cbe75f5d939677d5320219c71b9083f2bbb0b24..f301f3f52751a505d3475c1782779651089c1ef5 100644
--- a/bsp/stm32/stm32f411-atk-nano/board/board.h
+++ b/bsp/stm32/stm32f411-atk-nano/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 128
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f411-st-nucleo/board/board.h b/bsp/stm32/stm32f411-st-nucleo/board/board.h
index 062038ffdb64336030280ffd05a3888b5374960e..25b839b380529513af7e13e5d66b6e7d1b895bc8 100644
--- a/bsp/stm32/stm32f411-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f411-st-nucleo/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 128
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f411-weact-MiniF4/board/board.h b/bsp/stm32/stm32f411-weact-MiniF4/board/board.h
index 062038ffdb64336030280ffd05a3888b5374960e..25b839b380529513af7e13e5d66b6e7d1b895bc8 100644
--- a/bsp/stm32/stm32f411-weact-MiniF4/board/board.h
+++ b/bsp/stm32/stm32f411-weact-MiniF4/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 128
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f412-st-nucleo/board/board.h b/bsp/stm32/stm32f412-st-nucleo/board/board.h
index 5c463d04e8e576100f198fe0cba377d5296b9c0c..8d1465a1c9c3fd2676027d5da6f9b0ed3e738d76 100644
--- a/bsp/stm32/stm32f412-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f412-st-nucleo/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 256
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f413-st-nucleo/board/board.h b/bsp/stm32/stm32f413-st-nucleo/board/board.h
index 634003f596b7c14b43a4b6a61e28291e68ca0709..e98990ce7569164ba1a54d2c33925aa92209699b 100644
--- a/bsp/stm32/stm32f413-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f413-st-nucleo/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE 320
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f427-robomaster-a/board/board.h b/bsp/stm32/stm32f427-robomaster-a/board/board.h
index a0ea5ca4bd6b724c256170b03a14edb9854bfdbd..0e3a162baedd860bd45a564cf3f02b4755a87657 100644
--- a/bsp/stm32/stm32f427-robomaster-a/board/board.h
+++ b/bsp/stm32/stm32f427-robomaster-a/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/stm32/stm32f429-armfly-v6/board/board.h b/bsp/stm32/stm32f429-armfly-v6/board/board.h
index c0d30df246ff0592d0d6fcbe039fb854cf63c209..102b68f765422f61ea10243c8a47b5c83bd9afe2 100644
--- a/bsp/stm32/stm32f429-armfly-v6/board/board.h
+++ b/bsp/stm32/stm32f429-armfly-v6/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_FLASH_SIZE (2 * 1024 * 1024)
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
-#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/stm32/stm32f429-atk-apollo/board/board.h b/bsp/stm32/stm32f429-atk-apollo/board/board.h
index 077b0af7132f124afca4572c12b5d10b69b5e580..e07f601b842fb10f6bb487aa41ae301e174fa223 100644
--- a/bsp/stm32/stm32f429-atk-apollo/board/board.h
+++ b/bsp/stm32/stm32f429-atk-apollo/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE (192)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f429-fire-challenger/board/board.h b/bsp/stm32/stm32f429-fire-challenger/board/board.h
index c51f6a93cc37d5c6fcf8a7a8f3e8c8e99d996acd..6a205b9393f80800c61fcc1e7331447577b0cb9f 100644
--- a/bsp/stm32/stm32f429-fire-challenger/board/board.h
+++ b/bsp/stm32/stm32f429-fire-challenger/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_FLASH_SIZE (1024 * 1024)
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
-#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/stm32/stm32f429-st-disco/board/board.h b/bsp/stm32/stm32f429-st-disco/board/board.h
index ce8f2cc591e26bcc947b44ec77d77326fed95038..650b64a256a497f5b1025634e6137629ef75ee4c 100644
--- a/bsp/stm32/stm32f429-st-disco/board/board.h
+++ b/bsp/stm32/stm32f429-st-disco/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE (256 - 64)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f446-st-nucleo/board/board.h b/bsp/stm32/stm32f446-st-nucleo/board/board.h
index 8cb4438f8b97e0152179a38fae6cc9de274b882d..3da6cda6d205b09e64ceae943b00653ad00f596e 100644
--- a/bsp/stm32/stm32f446-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f446-st-nucleo/board/board.h
@@ -24,7 +24,7 @@
#define STM32_SRAM_SIZE 128
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f469-st-disco/board/board.h b/bsp/stm32/stm32f469-st-disco/board/board.h
index 607aa3877d6d2b094ceaf11200dd877c9e1facc6..14f3a6f037351f77855813566175d97a1d46427e 100644
--- a/bsp/stm32/stm32f469-st-disco/board/board.h
+++ b/bsp/stm32/stm32f469-st-disco/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE (384 - 64)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f746-st-disco/board/board.h b/bsp/stm32/stm32f746-st-disco/board/board.h
index b0c120fb410bdb1f003aea438338e02b669f3ab5..877bb022cf95b32078cf661ddccc5b4aa430d303 100644
--- a/bsp/stm32/stm32f746-st-disco/board/board.h
+++ b/bsp/stm32/stm32f746-st-disco/board/board.h
@@ -23,7 +23,7 @@
#define STM32_SRAM_SIZE (320)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f746-st-nucleo/board/board.h b/bsp/stm32/stm32f746-st-nucleo/board/board.h
index 3b37641ec99ca92f380c685ca89c579a92a16d69..0abf5077eb610bbbf7fad2c632a4ddbd5b3298a1 100644
--- a/bsp/stm32/stm32f746-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f746-st-nucleo/board/board.h
@@ -23,7 +23,7 @@
#define STM32_SRAM_SIZE (256)
#define STM32_SRAM_END (0x20010000 + STM32_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/stm32/stm32f767-atk-apollo/board/board.h b/bsp/stm32/stm32f767-atk-apollo/board/board.h
index e91271055eba72aa6d581750ef923773c50e76ef..807daaa75705cbe7fab796386a57e5bb33516cec 100644
--- a/bsp/stm32/stm32f767-atk-apollo/board/board.h
+++ b/bsp/stm32/stm32f767-atk-apollo/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE (512)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f767-fire-challenger-v1/board/board.h b/bsp/stm32/stm32f767-fire-challenger-v1/board/board.h
index e9a12778494f3f5e3e3794c044d2f9230cb3e4f6..cb7fa73806618640ea59b308969cb52d5d86f3cf 100644
--- a/bsp/stm32/stm32f767-fire-challenger-v1/board/board.h
+++ b/bsp/stm32/stm32f767-fire-challenger-v1/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_FLASH_SIZE (1024 * 1024)
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
-#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/stm32/stm32f767-st-nucleo/board/board.h b/bsp/stm32/stm32f767-st-nucleo/board/board.h
index 1d82defe0d68c0c7ece8f3bc2098039977c6491e..a721a56fc49b7c875e8c2abdefe26e65be752924 100644
--- a/bsp/stm32/stm32f767-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32f767-st-nucleo/board/board.h
@@ -24,7 +24,7 @@
#define STM32_SRAM_SIZE (512)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32f769-st-disco/board/board.h b/bsp/stm32/stm32f769-st-disco/board/board.h
index 813dd5b27eaa599d3152aa88b7b2e965da91f46d..5694d51bd42e32a4222fa91535e71955e34f752a 100644
--- a/bsp/stm32/stm32f769-st-disco/board/board.h
+++ b/bsp/stm32/stm32f769-st-disco/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE (512)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32g070-st-nucleo/board/board.h b/bsp/stm32/stm32g070-st-nucleo/board/board.h
index d36387892b84365204f815bc6c7216804a459838..d492da1eb9865b8149ad7638826e20aced8270c4 100644
--- a/bsp/stm32/stm32g070-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32g070-st-nucleo/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 36
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32g071-st-nucleo/board/board.h b/bsp/stm32/stm32g071-st-nucleo/board/board.h
index d36387892b84365204f815bc6c7216804a459838..d492da1eb9865b8149ad7638826e20aced8270c4 100644
--- a/bsp/stm32/stm32g071-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32g071-st-nucleo/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 36
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32g431-st-nucleo/board/board.h b/bsp/stm32/stm32g431-st-nucleo/board/board.h
index 6fd0c97890bdfce7a615b78c50d6da49f432ccaf..d7d48a2db779b4e08e76b9ac7b361aec294250e4 100644
--- a/bsp/stm32/stm32g431-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32g431-st-nucleo/board/board.h
@@ -24,7 +24,7 @@
#define STM32_SRAM_SIZE 32
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32g474-st-nucleo/board/board.h b/bsp/stm32/stm32g474-st-nucleo/board/board.h
index 6fd0c97890bdfce7a615b78c50d6da49f432ccaf..d7d48a2db779b4e08e76b9ac7b361aec294250e4 100644
--- a/bsp/stm32/stm32g474-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32g474-st-nucleo/board/board.h
@@ -24,7 +24,7 @@
#define STM32_SRAM_SIZE 32
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32h743-armfly-V7/board/board.h b/bsp/stm32/stm32h743-armfly-V7/board/board.h
index 32eb25f14716fa7e4a16c0fb27c0e7dbb94e6878..d511a1f8474fdc6f66231c50ede6550244b747d3 100644
--- a/bsp/stm32/stm32h743-armfly-V7/board/board.h
+++ b/bsp/stm32/stm32h743-armfly-V7/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE (512)
#define STM32_SRAM_END (0x24000000 + STM32_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/stm32/stm32h743-atk-apollo/board/board.h b/bsp/stm32/stm32h743-atk-apollo/board/board.h
index c9ec7a30d9aa72dcd22be7fab4fe322148ef2903..10fe8dae36e9695042baa5b12837f6e4aa245842 100644
--- a/bsp/stm32/stm32h743-atk-apollo/board/board.h
+++ b/bsp/stm32/stm32h743-atk-apollo/board/board.h
@@ -31,7 +31,7 @@ extern "C" {
#define STM32_SRAM_SIZE (512)
#define STM32_SRAM_END (0x24000000 + STM32_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/stm32/stm32h743-openmv-h7plus/board/board.h b/bsp/stm32/stm32h743-openmv-h7plus/board/board.h
index c2bf0c03231b950c180dc90f6d05bddbb177543b..b1e723057d783efed0e2101b6c9faffc8595c58b 100644
--- a/bsp/stm32/stm32h743-openmv-h7plus/board/board.h
+++ b/bsp/stm32/stm32h743-openmv-h7plus/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/stm32/stm32h743-st-nucleo/board/board.h b/bsp/stm32/stm32h743-st-nucleo/board/board.h
index 32eb25f14716fa7e4a16c0fb27c0e7dbb94e6878..d511a1f8474fdc6f66231c50ede6550244b747d3 100644
--- a/bsp/stm32/stm32h743-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32h743-st-nucleo/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE (512)
#define STM32_SRAM_END (0x24000000 + STM32_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/stm32/stm32h747-st-discovery/board/board.h b/bsp/stm32/stm32h747-st-discovery/board/board.h
index 85196a766467c726e67f5806de1ff577556a4714..f13926d8a74bc39fff4703f3d56dd7f9275a4a75 100644
--- a/bsp/stm32/stm32h747-st-discovery/board/board.h
+++ b/bsp/stm32/stm32h747-st-discovery/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE (128)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32h750-armfly-h7-tool/board/board.h b/bsp/stm32/stm32h750-armfly-h7-tool/board/board.h
index b41ed17e434e161abace0fdb2d3603103da77937..657a668b6439f7cf113c383a1b30c30ff0aa696d 100644
--- a/bsp/stm32/stm32h750-armfly-h7-tool/board/board.h
+++ b/bsp/stm32/stm32h750-armfly-h7-tool/board/board.h
@@ -27,7 +27,7 @@ extern "C" {
#define STM32_SRAM_SIZE (128)
#define STM32_SRAM_END (0x20000000 + STM32_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/stm32/stm32h750-artpi-h750/board/board.h b/bsp/stm32/stm32h750-artpi-h750/board/board.h
index ac48db06bf904a8245ecc65eb5baf3239974d8b9..61b43c8c23aada2d7ef2358e9011c34108ebb996 100644
--- a/bsp/stm32/stm32h750-artpi-h750/board/board.h
+++ b/bsp/stm32/stm32h750-artpi-h750/board/board.h
@@ -77,7 +77,7 @@ extern "C" {
#define STM32_SRAM1_START RAM_START
#define STM32_SRAM1_END RAM_END
-#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/stm32/stm32l010-st-nucleo/board/board.h b/bsp/stm32/stm32l010-st-nucleo/board/board.h
index 67e4ad5ec0afc562f2fb2980983eb0dbb2c7097a..3e6096d63d4b2c41318504a38ce5d97994fc1dd8 100644
--- a/bsp/stm32/stm32l010-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32l010-st-nucleo/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 20
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32l053-st-nucleo/board/board.h b/bsp/stm32/stm32l053-st-nucleo/board/board.h
index f88ee5194618700cbef7b2b97a84417b2177a646..91745ef06453e09dbcae8f698a6750fc28cd8dba 100644
--- a/bsp/stm32/stm32l053-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32l053-st-nucleo/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM_SIZE 8
#define STM32_SRAM_END (0x20000000 + STM32_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__
diff --git a/bsp/stm32/stm32l433-ali-startkit/board/board.h b/bsp/stm32/stm32l433-ali-startkit/board/board.h
index 50468368919e76fab07b17339c2fcc6d003da314..59c7733604575397fea8659463bac93e98f2f100 100644
--- a/bsp/stm32/stm32l433-ali-startkit/board/board.h
+++ b/bsp/stm32/stm32l433-ali-startkit/board/board.h
@@ -34,7 +34,7 @@ extern "C" {
#define STM32_FLASH_SIZE (256 * 1024)
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
-#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__
diff --git a/bsp/stm32/stm32l452-st-nucleo/board/board.h b/bsp/stm32/stm32l452-st-nucleo/board/board.h
index 0c9006dc40410580d1357d980c32a9ed4f608abf..9c481c4983344ad92cc374183efa92200349503a 100644
--- a/bsp/stm32/stm32l452-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32l452-st-nucleo/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/board.h b/bsp/stm32/stm32l475-atk-pandora/board/board.h
index a1029a3e99e5f8cc2ef735f5bf29088bfe16faaf..c91fb31d238f3fa040c513a6e89efe4b12ba3104 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/board.h
+++ b/bsp/stm32/stm32l475-atk-pandora/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/stm32/stm32l496-ali-developer/board/board.h b/bsp/stm32/stm32l496-ali-developer/board/board.h
index 8c0daff8b5706cf0f82b757185627a2dec48010d..dc2db87b7065fa9614bfd68efc4437c0675b753c 100644
--- a/bsp/stm32/stm32l496-ali-developer/board/board.h
+++ b/bsp/stm32/stm32l496-ali-developer/board/board.h
@@ -39,7 +39,7 @@ extern "C" {
#define STM32_FLASH_SIZE (1024 * 1024)
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
-#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__
diff --git a/bsp/stm32/stm32l496-st-nucleo/board/board.h b/bsp/stm32/stm32l496-st-nucleo/board/board.h
index f9edac21da58d083cd12dc27e05f7ed23ce2c0ea..63f09134c0b619aacb104ed1168f2522182ac3b0 100644
--- a/bsp/stm32/stm32l496-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32l496-st-nucleo/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.h b/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.h
index 049be64f386ab86ecdc7e0b3f8f3245662a13869..9a9df06b236587cf332a47a641766d6a2d5aa7ac 100644
--- a/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.h
+++ b/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.h
@@ -28,7 +28,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/stm32/stm32l552-st-nucleo/board/board.h b/bsp/stm32/stm32l552-st-nucleo/board/board.h
index 049dfd05fb2cf3ba5ed95b8355d56e7e63743b8a..479a4262fb50748ea31aa18ba61b9fc618e1b7ab 100644
--- a/bsp/stm32/stm32l552-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32l552-st-nucleo/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/board.h b/bsp/stm32/stm32mp157a-st-discovery/board/board.h
index 0b60c68af441b6e22899a5d350e528759a45121d..332f4ad30821d9e987832c99f35abb9d3fa2d053 100644
--- a/bsp/stm32/stm32mp157a-st-discovery/board/board.h
+++ b/bsp/stm32/stm32mp157a-st-discovery/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM_SIZE (64)
#define STM32_SRAM_END (0x10030000 + 64 * 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/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_mic.c b/bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_mic.c
index 45b0afe762d2acdc0bed1afbf1abae66da0bad1f..35c4d0a34236b096921c4dd9e42ba93b394c8cc6 100644
--- a/bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_mic.c
+++ b/bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_mic.c
@@ -24,7 +24,7 @@
/* SYSRAM */
#define RX_FIFO_SIZE (4096)
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
rt_uint8_t MIC_RX_FIFO[RX_FIFO_SIZE] __attribute__((at(0x2FFC2000)));
#elif defined(__ICCARM__)
#pragma location = 0x2FFC2000
diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_sound.c b/bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_sound.c
index 6a057fa72fe3c1d8f84ccd391296ea5486ba46f1..89f770414565f3e248be4a945ae19fb950f9343b 100644
--- a/bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_sound.c
+++ b/bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/drv_sound.c
@@ -22,7 +22,7 @@
/* SYSRAM */
#define TX_FIFO_SIZE (4096)
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE] __attribute__((at(0x2FFC3000)));
#elif defined(__ICCARM__)
#pragma location = 0x2FFC3000
diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_eth.c b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_eth.c
index 229c3e585e7205c7949f687653d527968c6bc62c..8de506591ae0c1962d9577fb5aaa574820ac9cfe 100644
--- a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_eth.c
+++ b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_eth.c
@@ -44,7 +44,7 @@ static TxDmaDesc txDmaDesc[ETH_TXBUFNB];
#pragma location = RX_DMA_ADD_BASE
static RxDmaDesc rxDmaDesc[ETH_RXBUFNB];
-#elif defined(__CC_ARM) || defined(__CLANG_ARM)
+#elif defined(__ARMCC_VERSION)
/* transmit buffer */
static rt_uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((at(TX_ADD_BASE)));
/* Receive buffer */
diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.c b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.c
index 9d128a28923abdcfd42394f13a8366359170a2b6..21d207c24c29a995ae710a443b78e8068dbd08e7 100644
--- a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.c
+++ b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.c
@@ -55,7 +55,7 @@ struct rthw_sdio
/* SYSRAM SDMMC1/2 accesses */
#define SDCARD_ADDR 0x2FFFF000
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
__attribute__((at(SDCARD_ADDR))) static rt_uint8_t cache_buf[SDIO_BUFF_SIZE];
#elif defined ( __GNUC__ )
static rt_uint8_t cache_buf[SDIO_BUFF_SIZE] __attribute__((section(".SdCardSection")));
diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/board.h b/bsp/stm32/stm32mp157a-st-ev1/board/board.h
index 0406e499524ea20869a5b304da36260cb9ada59d..5775caf20b233a50078202f8e6ee6ae162dc25d8 100644
--- a/bsp/stm32/stm32mp157a-st-ev1/board/board.h
+++ b/bsp/stm32/stm32mp157a-st-ev1/board/board.h
@@ -30,7 +30,7 @@ extern "C" {
#define STM32_SRAM_SIZE (64)
#define STM32_SRAM_END (0x10030000 + 64 * 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/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c
index 61600fbd00443f6ad102ee1a494aa69077e21c84..990537241ebc85b4515e7905b8fb03d31bcb412b 100644
--- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c
+++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c
@@ -19,7 +19,7 @@
#include
#define FILTER_FIFO_SIZE (1024)
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
__attribute__((at(0x2FFC8000))) static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE];
#elif defined ( __GNUC__ )
static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE] __attribute__((section(".Filter0Section")));
@@ -28,7 +28,7 @@ static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE] __attribute__((section(".Filter
__no_init static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE];
#endif
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
__attribute__((at(0x2FFC9000))) static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE];
#elif defined ( __GNUC__ )
static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE] __attribute__((section(".Filter1Section")));
@@ -38,7 +38,7 @@ __no_init static rt_int32_t FILTER1_FIFO[FILTER_FIFO_SIZE];
#endif
#define PALY_SIZE 2048
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
__attribute__((at(0x2FFCA000))) static rt_int16_t PLAY_BUF[PALY_SIZE];
#elif defined ( __GNUC__ )
__attribute__((at(0x2FFCA000))) __attribute__((section(".DfsdmSection")));
diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c
index 2da6ddc485d392b8b1c799b4f7ada94f4d87538f..b935c40df2f10ccb108cd7e05cd9f452f649b298 100644
--- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c
+++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c
@@ -50,7 +50,7 @@ struct rthw_sdio
#define EMMC_BUFF_SIZE 4096
#define EMMC_BUFF_ADDR 0x2FFCB000
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
__attribute__((at(EMMC_BUFF_ADDR))) static rt_uint8_t cache_buf[EMMC_BUFF_SIZE];
#elif defined ( __GNUC__ )
static rt_uint8_t cache_buf[EMMC_BUFF_SIZE] __attribute__((section(".eMMCSection")));
diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c
index da4d602a67596564added7f1a512039b891de939..69af85e27be2cf6bbd26482484ebe440a4f9e4d6 100644
--- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c
+++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c
@@ -27,7 +27,7 @@
#define JPEG_BUF_SIZE 8 * 1024
#define JPEG_LINE_SIZE 1 * 1024
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
__attribute__((at(0x2FFCC000))) static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE];
#elif defined(__GNUC__)
static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE] __attribute__((section(".Dcmi0Section")));
@@ -36,7 +36,7 @@ static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE] __attribute__((section(".Dcmi0Sec
__no_init static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE];
#endif
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
__attribute__((at(0x2FFDC000))) static rt_int32_t JPEG_LINE_BUF[2][JPEG_LINE_SIZE];
#elif defined(__GNUC__)
static rt_int32_t JPEG_LINE_BUF[2][JPEG_LINE_SIZE] __attribute__((section(".Dcmi1Section")));
diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c
index bb6e92584f8acdeaa48b0858037f392d13072158..b8f524e59a75ee9acd7bccb03dc5c4fd96cfe979 100644
--- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c
+++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c
@@ -42,7 +42,7 @@ struct rt_completion rx_comp;
/* SYSRAM SDMMC1/2 accesses */
#define SDIO_BUFF_SIZE 512
#define SDCARD_ADDR 0x2FFC0000
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
__attribute__((at(SDCARD_ADDR))) static rt_uint32_t cache_buf[SDIO_BUFF_SIZE];
#elif defined ( __GNUC__ )
static rt_uint32_t cache_buf[SDIO_BUFF_SIZE] __attribute__((section(".SdCardSection")));
diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c
index 4aee0458250c463b81f308bd5ae4809e3a476d14..b9e76a0703385ffee64b7e022906c6de59146839 100644
--- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c
+++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c
@@ -22,7 +22,7 @@
#define SOUND_BUS_NAME "i2c2"
#define TX_FIFO_SIZE (4096)
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
__attribute__((at(0x2FFC2000))) static rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE];
#elif defined ( __GNUC__ )
static rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE] __attribute__((section(".AudioSection")));
diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c
index 670a00e35e507a6d22b350bad482a3e4925a40c8..4f7bea280df4a618be93b57a8eb8f35709da0a73 100644
--- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c
+++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c
@@ -44,7 +44,7 @@ __no_init static TxDmaDesc txDmaDesc[ETH_TXBUFNB];
#pragma location = RX_DMA_ADD_BASE
__no_init static RxDmaDesc rxDmaDesc[ETH_RXBUFNB];
-#elif defined(__CC_ARM) || defined(__CLANG_ARM)
+#elif defined(__ARMCC_VERSION)
/* transmit buffer */
static rt_uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((at(TX_ADD_BASE)));
/* Receive buffer */
diff --git a/bsp/stm32/stm32u575-st-nucleo/board/board.h b/bsp/stm32/stm32u575-st-nucleo/board/board.h
index 8a5abd81909e361d210d5b6850a94265b1a90241..21566e54c8a08fb7e79cc2da9099bec5ec42e558 100644
--- a/bsp/stm32/stm32u575-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32u575-st-nucleo/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/stm32/stm32wb55-st-nucleo/board/board.h b/bsp/stm32/stm32wb55-st-nucleo/board/board.h
index 366ef99b50289373bf32f48cf54a97c5beed500a..869826a3c2cce97044e6ee1d7a4836f93e6ea896 100644
--- a/bsp/stm32/stm32wb55-st-nucleo/board/board.h
+++ b/bsp/stm32/stm32wb55-st-nucleo/board/board.h
@@ -29,7 +29,7 @@ extern "C" {
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_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__
diff --git a/bsp/swm320-lq100/drivers/board.h b/bsp/swm320-lq100/drivers/board.h
index 223018920fed39dd08c5f8784eff7c16440f222e..c139890e57bf5f1a8cf856e8510184d1f2cb306c 100644
--- a/bsp/swm320-lq100/drivers/board.h
+++ b/bsp/swm320-lq100/drivers/board.h
@@ -34,7 +34,7 @@ extern "C"
#define EXT_SRAM_END (EXT_SRAM_BASE + EXT_SRAM_SIZE)
#endif
-#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__
diff --git a/bsp/swm320/drivers/board.h b/bsp/swm320/drivers/board.h
index 223018920fed39dd08c5f8784eff7c16440f222e..c139890e57bf5f1a8cf856e8510184d1f2cb306c 100644
--- a/bsp/swm320/drivers/board.h
+++ b/bsp/swm320/drivers/board.h
@@ -34,7 +34,7 @@ extern "C"
#define EXT_SRAM_END (EXT_SRAM_BASE + EXT_SRAM_SIZE)
#endif
-#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__
diff --git a/bsp/tm4c123bsp/board/board.h b/bsp/tm4c123bsp/board/board.h
index f12ba9c5b5e22b15cfc47c9aa9df092c4eac38cc..0f8c5aff40bee9b5bc84cfc946221fa7abff4128 100644
--- a/bsp/tm4c123bsp/board/board.h
+++ b/bsp/tm4c123bsp/board/board.h
@@ -18,7 +18,7 @@
#define TM4C123_SRAM1_START (0x20000000)
#define TM4C123_SRAM1_END (TM4C123_SRAM1_START + 32 * 1024) // end address = 0x20000000(base adddress) + 32K(RAM size)
- #if defined(__CC_ARM) || defined(__CLANG_ARM)
+ #if defined(__ARMCC_VERSION)
extern int Image$$RW_IRAM$$ZI$$Limit; // RW_IRAM
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM$$ZI$$Limit)
#elif __ICCARM__
diff --git a/bsp/wch/arm/ch32f103c8-core/board/board.h b/bsp/wch/arm/ch32f103c8-core/board/board.h
index a606f4dc032d64c68ba48586849799c90228780b..f4073203a762a03b699283c2932395bd52bd18cf 100644
--- a/bsp/wch/arm/ch32f103c8-core/board/board.h
+++ b/bsp/wch/arm/ch32f103c8-core/board/board.h
@@ -26,7 +26,7 @@ extern "C" {
#define CH32_SRAM_SIZE 20
#define CH32_SRAM_END (0x20000000 + CH32_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__
diff --git a/bsp/yichip/yc3121-pos/drivers/board.h b/bsp/yichip/yc3121-pos/drivers/board.h
index 573c6454a97b7e11054a3fae7bd645b5e4bf92d0..59b21029e8de01de71f1b84e12d53061ae228801 100644
--- a/bsp/yichip/yc3121-pos/drivers/board.h
+++ b/bsp/yichip/yc3121-pos/drivers/board.h
@@ -28,7 +28,7 @@
#endif
#define SRAM_END (SRAM_BASE + SRAM_SIZE)
-#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__
diff --git a/components/cplusplus/cxx_crt_init.c b/components/cplusplus/cxx_crt_init.c
index 977dee6ee931783e29240f914033da7c0c91e90c..46946089ffaf5f517198663322c12ec00d9a0f9d 100644
--- a/components/cplusplus/cxx_crt_init.c
+++ b/components/cplusplus/cxx_crt_init.c
@@ -13,7 +13,7 @@
#include
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
extern void $Super$$__cpp_initialize__aeabi_(void);
/* we need to change the cpp_initialize order */
RT_WEAK void $Sub$$__cpp_initialize__aeabi_(void)
@@ -36,7 +36,7 @@ RT_WEAK void *__dso_handle = 0;
RT_WEAK int cplusplus_system_init(void)
{
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
/* If there is no SHT$$INIT_ARRAY, calling
* $Super$$__cpp_initialize__aeabi_() will cause fault. At least until Keil5.12
* the problem still exists. So we have to initialize the C++ runtime by ourself.
diff --git a/components/libc/compilers/armlibc/syscalls.c b/components/libc/compilers/armlibc/syscalls.c
index 54d8b40bf64744ebcde96b20da6f338abb708416..14b47d36270204f63834b0681aa09a20debcfa84 100644
--- a/components/libc/compilers/armlibc/syscalls.c
+++ b/components/libc/compilers/armlibc/syscalls.c
@@ -30,11 +30,11 @@
#define DBG_LVL DBG_INFO
#include
-#ifdef __CLANG_ARM
+#ifdef __clang__
__asm(".global __use_no_semihosting\n\t");
#else
#pragma import(__use_no_semihosting_swi)
-#endif /* __CLANG_ARM */
+#endif
/* Standard IO device handles. */
#define STDIN 0
diff --git a/components/utilities/utest/utest.c b/components/utilities/utest/utest.c
index 7103efb89cb63f572f1bee6c02dba19ea7257e13..8c8ffd674a0ef42d75329ec6ba8358950f8664f4 100644
--- a/components/utilities/utest/utest.c
+++ b/components/utilities/utest/utest.c
@@ -68,7 +68,7 @@ void utest_log_lv_set(rt_uint8_t lv)
int utest_init(void)
{
/* initialize the utest commands table.*/
-#if defined(__CC_ARM) || defined(__CLANG_ARM) /* ARM C Compiler */
+#if defined(__ARMCC_VERSION) /* ARM C Compiler */
extern const int UtestTcTab$$Base;
extern const int UtestTcTab$$Limit;
tc_table = (utest_tc_export_t)&UtestTcTab$$Base;
diff --git a/components/utilities/var_export/var_export.c b/components/utilities/var_export/var_export.c
index f4623dec04b85da3f597c1e2813a3dec827e1022..1e54f393622c86b0a105363459d424c0064cc1eb 100644
--- a/components/utilities/var_export/var_export.c
+++ b/components/utilities/var_export/var_export.c
@@ -20,7 +20,7 @@ static rt_size_t ve_exporter_num = 0;
#endif
/* for ARM C and IAR Compiler */
-#if defined(__CC_ARM) || defined(__CLANG_ARM) || defined (__ICCARM__) || defined(__ICCRX__)
+#if defined(__ARMCC_VERSION) || defined (__ICCARM__) || defined(__ICCRX__)
static RT_USED const struct ve_exporter __ve_table_start
RT_SECTION("0.""VarExpTab") = {"ve_start", "ve_start", 0};
@@ -43,7 +43,7 @@ RT_USED const struct ve_exporter __ve_table_end = { "ve_end", "ve_end", 2};
int var_export_init(void)
{
/* initialize the var export table.*/
-#if defined(__CC_ARM) || defined(__CLANG_ARM) /* for ARM C Compiler */
+#if defined(__ARMCC_VERSION) /* for ARM C Compiler */
ve_exporter_table = &__ve_table_start + 1;
ve_exporter_num = &__ve_table_end - &__ve_table_start;
#elif defined (__GNUC__) /* for GCC Compiler */
@@ -94,7 +94,7 @@ int var_export_init(void)
}
}
ve_exporter_table = ve_exporter_tab;
-#endif /* __CC_ARM || __CLANG_ARM */
+#endif /* __ARMCC_VERSION */
return ve_exporter_num;
}
diff --git a/include/rtdef.h b/include/rtdef.h
index b31bd1e3f8a131aea47119402a2aa4a653bf3228..bc133d4271cad786f0a66623785ac76e4ceca6d2 100644
--- a/include/rtdef.h
+++ b/include/rtdef.h
@@ -115,10 +115,6 @@ typedef rt_base_t rt_off_t; /**< Type for offset */
#define RT_MB_ENTRY_MAX RT_UINT16_MAX /**< Maxium number of mailbox .entry */
#define RT_MQ_ENTRY_MAX RT_UINT16_MAX /**< Maxium number of message queue .entry */
-#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
-#define __CLANG_ARM
-#endif
-
#define RT_UNUSED(x) ((void)x)
/* Compiler Related Definitions */
diff --git a/libcpu/arm/cortex-m3/cpuport.c b/libcpu/arm/cortex-m3/cpuport.c
index d376f0042454c304ee89a53df245b8c760f39f81..66e2aa48093727858812aca7442968a7fc12b4ac 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 aa2325012c0710fcd12337140c80567e15ede085..71e1fea848e85699bcbfc55f97a5dd17b64a7449 100644
--- a/libcpu/arm/cortex-m33/cpuport.c
+++ b/libcpu/arm/cortex-m33/cpuport.c
@@ -20,7 +20,7 @@
#include
#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 f49f0c24f8c7f034ff7fd204c484bf2bf30cc900..2cc19a06e430efc3d6d7b10c22e908f8713f58cb 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 f24c33cf4d15baa4c094a2bdf054b2ae087e1a4d..6b748255c594f376a5472c909c3a0df5e6c72c21 100644
--- a/libcpu/arm/cortex-m4/cpuport.c
+++ b/libcpu/arm/cortex-m4/cpuport.c
@@ -20,7 +20,7 @@
#include
#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 f24c33cf4d15baa4c094a2bdf054b2ae087e1a4d..6b748255c594f376a5472c909c3a0df5e6c72c21 100644
--- a/libcpu/arm/cortex-m7/cpuport.c
+++ b/libcpu/arm/cortex-m7/cpuport.c
@@ -20,7 +20,7 @@
#include
#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/sim/win32/startup.c b/libcpu/sim/win32/startup.c
index 756d409315a15e77272e1b54e0f87e0f6dd88a81..e3e76323b9570f82b11783c8c1c474ebf79a6270 100644
--- a/libcpu/sim/win32/startup.c
+++ b/libcpu/sim/win32/startup.c
@@ -199,7 +199,7 @@ void rt_application_init(void);
void rt_hw_board_init(void);
int rtthread_startup(void);
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
extern int $Super$$main(void);
/* re-define main function */
int $Sub$$main(void)
@@ -248,7 +248,7 @@ void main_thread_entry(void *parameter)
rt_hw_secondary_cpu_up();
#endif
/* invoke system main function */
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
+#if defined(__ARMCC_VERSION)
{
extern int $Super$$main(void);
$Super$$main(); /* for ARMCC. */