From 5ed3e81490aac03d628d3545ff5922b43320bf55 Mon Sep 17 00:00:00 2001
From: charlown <charlown@163.com>
Date: Fri, 16 Sep 2022 20:13:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20=5F=5FARMCC=5FVERSION=20?=
 =?UTF-8?q?=E4=BB=A3=E6=9B=BF=20=5F=5FCC=5FARM=20=E7=94=A8=E4=BB=A5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81AC6=E7=BC=96=E8=AF=91=20(#6436)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将__CC_ARM 替换成 __ARMCC_VERSION 用以支持AC6编译，通过gd32f303测试。
---
 bsp/gd32/arm/gd32103c-eval/board/board.h  | 2 +-
 bsp/gd32/arm/gd32105c-eval/board/board.h  | 2 +-
 bsp/gd32/arm/gd32105r-start/board/board.h | 2 +-
 bsp/gd32/arm/gd32107c-eval/board/board.h  | 2 +-
 bsp/gd32/arm/gd32205r-start/board/board.h | 2 +-
 bsp/gd32/arm/gd32207i-eval/board/board.h  | 2 +-
 bsp/gd32/arm/gd32303e-eval/board/board.h  | 2 +-
 bsp/gd32/arm/gd32305r-start/board/board.h | 2 +-
 bsp/gd32/arm/gd32307e-start/board/board.h | 2 +-
 bsp/gd32/arm/gd32407v-start/board/board.h | 2 +-
 bsp/gd32/arm/gd32450z-eval/board/board.h  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bsp/gd32/arm/gd32103c-eval/board/board.h b/bsp/gd32/arm/gd32103c-eval/board/board.h
index 0bf3e288a4..93df86f337 100644
--- a/bsp/gd32/arm/gd32103c-eval/board/board.h
+++ b/bsp/gd32/arm/gd32103c-eval/board/board.h
@@ -30,7 +30,7 @@ extern char __ICFEDIT_region_RAM_end__;
 #define GD32_SRAM_END          (0x20000000 + GD32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#ifdef __ARMCC_VERSION
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/gd32/arm/gd32105c-eval/board/board.h b/bsp/gd32/arm/gd32105c-eval/board/board.h
index 3312ada335..8807f4ef11 100644
--- a/bsp/gd32/arm/gd32105c-eval/board/board.h
+++ b/bsp/gd32/arm/gd32105c-eval/board/board.h
@@ -30,7 +30,7 @@ extern char __ICFEDIT_region_RAM_end__;
 #define GD32_SRAM_END          (0x20000000 + GD32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#ifdef __ARMCC_VERSION
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/gd32/arm/gd32105r-start/board/board.h b/bsp/gd32/arm/gd32105r-start/board/board.h
index eb89837241..3af492a33d 100644
--- a/bsp/gd32/arm/gd32105r-start/board/board.h
+++ b/bsp/gd32/arm/gd32105r-start/board/board.h
@@ -29,7 +29,7 @@ extern char __ICFEDIT_region_RAM_end__;
 #define GD32_SRAM_END          (0x20000000 + GD32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#ifdef __ARMCC_VERSION
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/gd32/arm/gd32107c-eval/board/board.h b/bsp/gd32/arm/gd32107c-eval/board/board.h
index 3312ada335..8807f4ef11 100644
--- a/bsp/gd32/arm/gd32107c-eval/board/board.h
+++ b/bsp/gd32/arm/gd32107c-eval/board/board.h
@@ -30,7 +30,7 @@ extern char __ICFEDIT_region_RAM_end__;
 #define GD32_SRAM_END          (0x20000000 + GD32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#ifdef __ARMCC_VERSION
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/gd32/arm/gd32205r-start/board/board.h b/bsp/gd32/arm/gd32205r-start/board/board.h
index 9c42e83ac1..df7a92c37b 100644
--- a/bsp/gd32/arm/gd32205r-start/board/board.h
+++ b/bsp/gd32/arm/gd32205r-start/board/board.h
@@ -30,7 +30,7 @@ extern char __ICFEDIT_region_RAM_end__;
 #define GD32_SRAM_END          (0x20000000 + GD32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#ifdef __ARMCC_VERSION
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/gd32/arm/gd32207i-eval/board/board.h b/bsp/gd32/arm/gd32207i-eval/board/board.h
index 49d44d8948..0909c61ac3 100644
--- a/bsp/gd32/arm/gd32207i-eval/board/board.h
+++ b/bsp/gd32/arm/gd32207i-eval/board/board.h
@@ -30,7 +30,7 @@ extern char __ICFEDIT_region_RAM_end__;
 #define GD32_SRAM_END          (0x20000000 + GD32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#ifdef __ARMCC_VERSION
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/gd32/arm/gd32303e-eval/board/board.h b/bsp/gd32/arm/gd32303e-eval/board/board.h
index 57e4dd68f8..5a545adaaf 100644
--- a/bsp/gd32/arm/gd32303e-eval/board/board.h
+++ b/bsp/gd32/arm/gd32303e-eval/board/board.h
@@ -30,7 +30,7 @@ extern char __ICFEDIT_region_RAM_end__;
 #define GD32_SRAM_END          (0x20000000 + GD32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#ifdef __ARMCC_VERSION
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/gd32/arm/gd32305r-start/board/board.h b/bsp/gd32/arm/gd32305r-start/board/board.h
index 7bc2c83c60..6626f3b4f6 100644
--- a/bsp/gd32/arm/gd32305r-start/board/board.h
+++ b/bsp/gd32/arm/gd32305r-start/board/board.h
@@ -30,7 +30,7 @@ extern char __ICFEDIT_region_RAM_end__;
 #define GD32_SRAM_END          (0x20000000 + GD32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#ifdef __ARMCC_VERSION
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/gd32/arm/gd32307e-start/board/board.h b/bsp/gd32/arm/gd32307e-start/board/board.h
index 7bc2c83c60..6626f3b4f6 100644
--- a/bsp/gd32/arm/gd32307e-start/board/board.h
+++ b/bsp/gd32/arm/gd32307e-start/board/board.h
@@ -30,7 +30,7 @@ extern char __ICFEDIT_region_RAM_end__;
 #define GD32_SRAM_END          (0x20000000 + GD32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#ifdef __ARMCC_VERSION
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/gd32/arm/gd32407v-start/board/board.h b/bsp/gd32/arm/gd32407v-start/board/board.h
index 237a77cc5b..f443dd7606 100644
--- a/bsp/gd32/arm/gd32407v-start/board/board.h
+++ b/bsp/gd32/arm/gd32407v-start/board/board.h
@@ -30,7 +30,7 @@ extern char __ICFEDIT_region_RAM_end__;
 #define GD32_SRAM_END          (0x20000000 + GD32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#ifdef __ARMCC_VERSION
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
diff --git a/bsp/gd32/arm/gd32450z-eval/board/board.h b/bsp/gd32/arm/gd32450z-eval/board/board.h
index 70ad21024d..63b5acfdc8 100644
--- a/bsp/gd32/arm/gd32450z-eval/board/board.h
+++ b/bsp/gd32/arm/gd32450z-eval/board/board.h
@@ -30,7 +30,7 @@ extern char __ICFEDIT_region_RAM_end__;
 #define GD32_SRAM_END          (0x20000000 + GD32_SRAM_SIZE * 1024)
 #endif
 
-#ifdef __CC_ARM
+#ifdef __ARMCC_VERSION
 extern int Image$$RW_IRAM1$$ZI$$Limit;
 #define HEAP_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
 #elif __ICCARM__
-- 
GitLab