Using cortex_a7-vfp4 for soft float

xfangfang · May 15, 2024 · 3c6c992 · 3c6c992
1 parent f9a6989
commit 3c6c992
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -45,7 +45,7 @@ jobs:
           - { target: arm-linux-musleabi, os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma",
               cmake: "-DUSE_SYSTEM_PCAP=OFF -DZIG_COMPILE_OPTION='-mcpu=cortex_a7'", name: "(cortex_a7_softfp)" }
           - { 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 -vfp4'", name: "(cortex_a7_soft)" }
+              cmake: "-DUSE_SYSTEM_PCAP=OFF -DZIG_COMPILE_OPTION='-mcpu=cortex_a7-vfp4'", name: "(cortex_a7_soft)" }
           - { 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_EXTRA_ARGS@ "$@"
+@ZIG@ cc "$@"
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_EXTRA_ARGS@ "$@"
+@ZIG@ c++ "$@"