From c636f4a69df3e92faf2e5a98d75771ad0613027a Mon Sep 17 00:00:00 2001
From: rcitach <yearsince@yeah.net>
Date: Fri, 25 Apr 2025 09:43:32 +0800
Subject: [PATCH 1/2] Fix Aarch64 architecture runtime issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

该问题由5b3320624da5149fc21c2d3e1f321d855e3d0dfe引入，导致工具链编译时加上了 -std=gnu99,其他架构是否出问题暂时未知
---
 libcpu/aarch64/SConscript | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libcpu/aarch64/SConscript b/libcpu/aarch64/SConscript
index c4dd45682c1..5dece501d99 100644
--- a/libcpu/aarch64/SConscript
+++ b/libcpu/aarch64/SConscript
@@ -24,4 +24,12 @@ group = group + SConscript(os.path.join('common', 'SConscript'))
 if rtconfig.CPU != 'common':
     group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))
 
+def del_gnu99():
+    for g in Projects:
+        if g["name"] == "Kernel":
+            flags = re.sub(r'\s+', ' ', re.sub(r'\s*-std=gnu99\s*', ' ', g["LOCAL_CFLAGS"])).strip()
+            flags = re.sub(r'(?<!\s)(-Wunused)', r' \1', flags)
+            g["LOCAL_CFLAGS"] = flags
+
+RegisterPreBuildingAction(del_gnu99)
 Return('group')

From d7266b98b4b7e1ff94c618c9d7fa861d2615f33d Mon Sep 17 00:00:00 2001
From: rcitach <yearsince@yeah.net>
Date: Fri, 25 Apr 2025 09:53:34 +0800
Subject: [PATCH 2/2] import re

---
 libcpu/aarch64/SConscript | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libcpu/aarch64/SConscript b/libcpu/aarch64/SConscript
index 5dece501d99..957708fd996 100644
--- a/libcpu/aarch64/SConscript
+++ b/libcpu/aarch64/SConscript
@@ -1,6 +1,7 @@
 # RT-Thread building script for bridge
 
 import os
+import re
 from building import *
 
 Import('rtconfig')