From 4a27987c2a85c819539d61d00722d61de330768b Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 7 Sep 2025 11:21:11 +0200
Subject: [PATCH 1/7] Add extraction of AS "-m" flags from AS_FLAGS to
 PIO_AS_FLAGS

Extract AS flags with '-m' from AS_FLAGS variable.
---
 tools/copy-libs.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 27312c16..f74ace5a 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -322,6 +322,9 @@ done
 
 mkdir -p "$AR_SDK"
 
+# Extract AS flags with "-m"
+PIO_AS_FLAGS=$(echo "$AS_FLAGS" | grep -o '\-m[^[:space:]]*')
+
 # start generation of pioarduino-build.py
 AR_PLATFORMIO_PY="$AR_SDK/pioarduino-build.py"
 cat configs/pio_start.txt > "$AR_PLATFORMIO_PY"

From ca252c440b57ef91c90f50d7781f6b670071e230 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 7 Sep 2025 11:32:13 +0200
Subject: [PATCH 2/7] Refactor AS flags extraction in copy-libs.sh

---
 tools/copy-libs.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index f74ace5a..0b0012c0 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -323,20 +323,17 @@ done
 mkdir -p "$AR_SDK"
 
 # Extract AS flags with "-m"
-PIO_AS_FLAGS=$(echo "$AS_FLAGS" | grep -o '\-m[^[:space:]]*')
+PIO_AS_FLAGS+=$(echo "$AS_FLAGS" | grep -o '\-m[^[:space:]]*')
 
 # start generation of pioarduino-build.py
 AR_PLATFORMIO_PY="$AR_SDK/pioarduino-build.py"
 cat configs/pio_start.txt > "$AR_PLATFORMIO_PY"
 
 echo "    ASFLAGS=[" >> "$AR_PLATFORMIO_PY"
-if [ "$IS_XTENSA" = "y" ]; then
-	echo "        \"-mlongcalls\"" >> "$AR_PLATFORMIO_PY"
-elif [ "$IDF_TARGET" = "esp32p4" ]; then
-	echo "        \"-march=rv32imafc_zicsr_zifencei_xesppie\"" >> "$AR_PLATFORMIO_PY"
-else
-	echo "        \"-march=rv32imc_zicsr_zifencei\"" >> "$AR_PLATFORMIO_PY"
-fi
+set -- $PIO_AS_FLAGS
+for item; do
+	echo "        \"$item\"," >> "$AR_PLATFORMIO_PY"
+done
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 

From a34907702f41cf7801abe86c215e6be7b05eb978 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 7 Sep 2025 12:23:39 +0200
Subject: [PATCH 3/7] Refactor AS flags extraction in copy-libs.sh

Updated extraction of AS flags to include both CXX and C flags.
---
 tools/copy-libs.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 0b0012c0..e9a196c6 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -322,8 +322,13 @@ done
 
 mkdir -p "$AR_SDK"
 
-# Extract AS flags with "-m"
-PIO_AS_FLAGS+=$(echo "$AS_FLAGS" | grep -o '\-m[^[:space:]]*')
+# Extract flags with "-m"
+PIO_AS_FLAGS=$(
+    {
+        echo "$PIO_CXX_FLAGS" | grep -o '\-m[^[:space:]]*'
+        echo "$PIO_C_FLAGS" | grep -o '\-m[^[:space:]]*'
+    } | awk '!seen[$0]++' | tr '\n' ' '
+)
 
 # start generation of pioarduino-build.py
 AR_PLATFORMIO_PY="$AR_SDK/pioarduino-build.py"

From 73adaadbe147c1adcd167b5d1f0db3a31fb7b0f6 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 7 Sep 2025 12:25:18 +0200
Subject: [PATCH 4/7] Fix extraction of flags in copy-libs.sh

---
 tools/copy-libs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index e9a196c6..29465d6c 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -326,7 +326,7 @@ mkdir -p "$AR_SDK"
 PIO_AS_FLAGS=$(
     {
         echo "$PIO_CXX_FLAGS" | grep -o '\-m[^[:space:]]*'
-        echo "$PIO_C_FLAGS" | grep -o '\-m[^[:space:]]*'
+        echo "$PIO_CC_FLAGS" | grep -o '\-m[^[:space:]]*'
     } | awk '!seen[$0]++' | tr '\n' ' '
 )
 

From 9567cdb5cd56f4a7f08ab3c5bf10b0c3823c5974 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 7 Sep 2025 12:45:33 +0200
Subject: [PATCH 5/7] Update flag extraction in copy-libs.sh

---
 tools/copy-libs.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 29465d6c..176fbf03 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -322,12 +322,12 @@ done
 
 mkdir -p "$AR_SDK"
 
-# Extract flags with "-m"
+# Keep only -march, -mabi and -mlongcalls flags for Assembler
 PIO_AS_FLAGS=$(
-    {
-        echo "$PIO_CXX_FLAGS" | grep -o '\-m[^[:space:]]*'
-        echo "$PIO_CC_FLAGS" | grep -o '\-m[^[:space:]]*'
-    } | awk '!seen[$0]++' | tr '\n' ' '
+    {Öl 
+        echo "$PIO_CXX_FLAGS" | grep -oE '\-march=[^[:space:]]*|\-mabi=[^[:space:]]*|\-mlongcalls'
+        echo "$PIO_C_FLAGS" | grep -oE '\-march=[^[:space:]]*|\-mabi=[^[:space:]]*|\-mlongcalls'
+    } | awk '!seen[$0]++' | paste -sd ' '
 )
 
 # start generation of pioarduino-build.py

From e80d3d3ae4b601d3207c96d328c149827431c8f3 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 7 Sep 2025 12:48:35 +0200
Subject: [PATCH 6/7] Update PIO_AS_FLAGS to use PIO_CC_FLAGS

---
 tools/copy-libs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 176fbf03..57258ef4 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -326,7 +326,7 @@ mkdir -p "$AR_SDK"
 PIO_AS_FLAGS=$(
     {Öl 
         echo "$PIO_CXX_FLAGS" | grep -oE '\-march=[^[:space:]]*|\-mabi=[^[:space:]]*|\-mlongcalls'
-        echo "$PIO_C_FLAGS" | grep -oE '\-march=[^[:space:]]*|\-mabi=[^[:space:]]*|\-mlongcalls'
+        echo "$PIO_CC_FLAGS" | grep -oE '\-march=[^[:space:]]*|\-mabi=[^[:space:]]*|\-mlongcalls'
     } | awk '!seen[$0]++' | paste -sd ' '
 )
 

From 5dafb3c2998e4f8a5c0f25018f8f779cb56caa83 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 7 Sep 2025 13:10:51 +0200
Subject: [PATCH 7/7] grrr typo

Refactor PIO_AS_FLAGS to correctly filter assembler flags.
---
 tools/copy-libs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 57258ef4..b55c810a 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -324,7 +324,7 @@ mkdir -p "$AR_SDK"
 
 # Keep only -march, -mabi and -mlongcalls flags for Assembler
 PIO_AS_FLAGS=$(
-    {Öl 
+    {
         echo "$PIO_CXX_FLAGS" | grep -oE '\-march=[^[:space:]]*|\-mabi=[^[:space:]]*|\-mlongcalls'
         echo "$PIO_CC_FLAGS" | grep -oE '\-march=[^[:space:]]*|\-mabi=[^[:space:]]*|\-mlongcalls'
     } | awk '!seen[$0]++' | paste -sd ' '