From 1423fcb38b6f828aee0f211363be71c9f70618ce Mon Sep 17 00:00:00 2001 From: xfangfang <2553041586@qq.com> Date: Thu, 16 May 2024 03:59:49 +0800 Subject: [PATCH] Disable FP registers for soft float --- .github/workflows/ci.yaml | 4 +++- cmake/zig-tools/zig-cc.sh.in | 2 +- cmake/zig-tools/zig-cpp.sh.in | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 32770ba..c880ab5 100644 --- 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 index 0be1f5f..017855b 100755 --- a/cmake/zig-tools/zig-cc.sh.in +++ b/cmake/zig-tools/zig-cc.sh.in @@ -1,2 +1,2 @@ #!/bin/sh -@ZIG@ cc "$@" \ No newline at end of file +@ZIG@ cc @ZIG_EXTRA_ARGS@ "$@" \ No newline at end of file diff --git a/cmake/zig-tools/zig-cpp.sh.in b/cmake/zig-tools/zig-cpp.sh.in index d3d7f86..0c29ede 100755 --- a/cmake/zig-tools/zig-cpp.sh.in +++ b/cmake/zig-tools/zig-cpp.sh.in @@ -1,2 +1,2 @@ #!/bin/sh -@ZIG@ c++ "$@" \ No newline at end of file +@ZIG@ c++ @ZIG_EXTRA_ARGS@ "$@" \ No newline at end of file