Disable FP registers for soft float

xfangfang · May 15, 2024 · 1423fcb · 1423fcb
1 parent 81bb168
commit 1423fcb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -41,7 +41,9 @@ jobs:
           - { target: aarch64-linux-musl, os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma",
               cmake: "-DUSE_SYSTEM_PCAP=OFF" }
           - { target: arm-linux-musleabi, os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma",
-              cmake: "-DUSE_SYSTEM_PCAP=OFF -DZIG_COMPILE_OPTION='-mcpu=cortex_a7;-msoft-float'", name: "(cortex_a7)" }
+              cmake: "-DUSE_SYSTEM_PCAP=OFF -DZIG_COMPILE_OPTION='-mcpu=cortex_a7'", name: "(cortex_a7)" }
+          - { target: arm-linux-musleabi, os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma",
+              cmake: "-DUSE_SYSTEM_PCAP=OFF -DZIG_COMPILE_OPTION='-mcpu=cortex_a7' -DZIG_EXTRA_ARGS='-Xclang -target-feature -Xclang -fpregs'", name: "(cortex_a7_soft_float)" }
           - { target: arm-linux-musleabi, os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma",
               cmake: "-DUSE_SYSTEM_PCAP=OFF -DZIG_COMPILE_OPTION='-mcpu=arm1176jzf_s'", name: "(pi_zero_w)" }
           - { target: mipsel-linux-musl,  os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma",

diff --git a/cmake/zig-tools/zig-cc.sh.in b/cmake/zig-tools/zig-cc.sh.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@ZIG@ cc "$@"
+@ZIG@ cc @ZIG_EXTRA_ARGS@ "$@"
diff --git a/cmake/zig-tools/zig-cpp.sh.in b/cmake/zig-tools/zig-cpp.sh.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@ZIG@ c++ "$@"
+@ZIG@ c++ @ZIG_EXTRA_ARGS@ "$@"