From cabfda4ec6977a71e3a99b4dc613381a88c6ae0a Mon Sep 17 00:00:00 2001
From: Nicolas <Nicolas@nonan.net>
Date: Sat, 28 Feb 2026 22:07:27 +0100
Subject: [PATCH] CI: stencil build script updated with Cortex-A Thumb version

---
 tools/cross_compiler_unix/build_musl.sh | 5 ++++-
 tools/cross_compiler_unix/packobjs.sh   | 4 ++--
 tools/crosscompile.sh                   | 9 +++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/tools/cross_compiler_unix/build_musl.sh b/tools/cross_compiler_unix/build_musl.sh
index 2f16b1e..3f7b50e 100644
--- a/tools/cross_compiler_unix/build_musl.sh
+++ b/tools/cross_compiler_unix/build_musl.sh
@@ -26,8 +26,11 @@ sh ../packobjs.sh arm-none-eabi-gcc arm-none-eabi-ld /object_files/musl_objects_
 # Armv7
 sh ../packobjs.sh arm-none-eabi-gcc arm-none-eabi-ld /object_files/musl_objects_armv7.o "-march=armv7-a -mfpu=neon-vfpv3 -mfloat-abi=hard -marm"
 
+# Armv7 Thumb for Cortex-A
+sh ../packobjs.sh arm-none-eabi-gcc arm-none-eabi-ld /object_files/musl_objects_armv7thumb.o "-march=armv7-a -mfpu=neon-vfpv3 -mfloat-abi=hard -mthumb"
+
 # Armv7 Thumb for Cortex-M3..7
-sh ../packobjs.sh arm-none-eabi-gcc arm-none-eabi-ld /object_files/musl_objects_armv7thumb.o "-march=armv7e-m -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb"
+sh ../packobjs.sh arm-none-eabi-gcc arm-none-eabi-ld /object_files/musl_objects_armv7mthumb.o "-march=armv7e-m -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb"
 
 #sh ../packobjs.sh mips mips-linux-gnu-gcc-13 mips-linux-gnu-ld
 
diff --git a/tools/cross_compiler_unix/packobjs.sh b/tools/cross_compiler_unix/packobjs.sh
index ff5f32a..98e3c17 100644
--- a/tools/cross_compiler_unix/packobjs.sh
+++ b/tools/cross_compiler_unix/packobjs.sh
@@ -26,7 +26,7 @@ ar x ../../musl/lib/libc.a sqrtf.o logf.o expf.o sqrt.o
 ar x ../../musl/lib/libc.a logf_data.o __tandf.o __cosdf.o __sindf.o
 ar x ../../musl/lib/libc.a fabsf.o scalbn.o floor.o floorf.o exp2f_data.o powf.o powf_data.o
 ar x ../../musl/lib/libc.a __rem_pio2f.o __math_invalid.o __math_invalidf.o __stack_chk_fail.o
-ar x ../../musl/lib/libc.a __math_divzerof.o __math_oflowf.o __rem_pio2_large.o __math_uflowf.o __math_xflowf.o __rsqrt_tab.o
+ar x ../../musl/lib/libc.a __math_divzerof.o __math_oflowf.o __rem_pio2_large.o __math_uflowf.o __math_xflowf.o sqrt_data.o
 
 # Check out .lo (PIC)
 ar x ../../musl/lib/libc.a sinf.lo cosf.lo tanf.lo asinf.lo acosf.lo atanf.lo atan2f.lo
@@ -34,7 +34,7 @@ ar x ../../musl/lib/libc.a sqrtf.lo logf.lo expf.lo sqrt.lo
 ar x ../../musl/lib/libc.a logf_data.lo __tandf.lo __cosdf.lo __sindf.lo
 ar x ../../musl/lib/libc.a fabsf.lo scalbn.lo floor.lo floorf.o exp2f_data.lo powf.lo powf_data.lo
 ar x ../../musl/lib/libc.a __rem_pio2f.lo __math_invalid.lo __math_invalidf.lo __stack_chk_fail.lo
-ar x ../../musl/lib/libc.a __math_divzerof.lo __math_oflowf.lo __rem_pio2_large.lo __math_uflowf.lo __math_xflowf.lo __rsqrt_tab.lo
+ar x ../../musl/lib/libc.a __math_divzerof.lo __math_oflowf.lo __rem_pio2_large.lo __math_uflowf.lo __math_xflowf.lo sqrt_data.lo
 
 cd ../../musl
 
diff --git a/tools/crosscompile.sh b/tools/crosscompile.sh
index 9494ff2..29a15ca 100644
--- a/tools/crosscompile.sh
+++ b/tools/crosscompile.sh
@@ -36,15 +36,20 @@ arm-none-eabi-gcc -march=armv6 -mfpu=vfp -mfloat-abi=hard -marm $FLAGS -$OPT -c
 LIBGCC=$(arm-none-eabi-gcc -print-libgcc-file-name)
 arm-none-eabi-ld -r $STMP /object_files/musl_objects_armv6.o $LIBGCC -o $DEST/stencils_armv6_$OPT.o
 
-# ARMv7 hardware fp
+# ARMv7 hardware fp for Cortex-A
 arm-none-eabi-gcc -march=armv7-a -mfpu=neon-vfpv3 -mfloat-abi=hard -marm $FLAGS -$OPT -c $SRC -o $STMP
 LIBGCC=$(arm-none-eabi-gcc -print-libgcc-file-name)
 arm-none-eabi-ld -r $STMP /object_files/musl_objects_armv7.o $LIBGCC -o $DEST/stencils_armv7_$OPT.o
 
+# ARMv7 Thumb for Cortex-A with hardware fp
+arm-none-eabi-gcc -march=armv7-a -mfpu=neon-vfpv3 -mfloat-abi=hard -mthumb $FLAGS -$OPT -c $SRC -o $STMP
+LIBGCC=$(arm-none-eabi-gcc -print-libgcc-file-name)
+arm-none-eabi-ld -r $STMP /object_files/musl_objects_armv7thumb.o $LIBGCC -o $DEST/stencils_armv7thumb_$OPT.o
+
 # Armv7 Thumb for Cortex-M3..7 hardware fp
 arm-none-eabi-gcc -march=armv7e-m -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb $FLAGS -$OPT -c $SRC -o $STMP
 LIBGCC=$(arm-none-eabi-gcc -print-libgcc-file-name)
-arm-none-eabi-ld -r $STMP /object_files/musl_objects_armv7thumb.o $LIBGCC -o $DEST/stencils_armv7thumb_$OPT.o
+arm-none-eabi-ld -r $STMP /object_files/musl_objects_armv7mthumb.o $LIBGCC -o $DEST/stencils_armv7mthumb_$OPT.o
 
 # PowerPC64LE
 # powerpc64le-linux-gnu-gcc-13 $FLAGS -$OPT -c $SRC -o $DEST/stencils_ppc64le_$OPT.o