From: Icenowy Zheng <zhengxingda@iscas.ac.cn>
Date: Wed, 3 Jun 2026 16:35:41 +0000 (+0800)
Subject: boot: enable only IMAFDCZicsrZifencei for RISC-V
X-Git-Tag: v261-rc4~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1190f5c9906f849cb8e17c8ae0651883eee93eb;p=thirdparty%2Fsystemd.git

boot: enable only IMAFDCZicsrZifencei for RISC-V

The UEFI specification only defines A/C/I/M/Zicsr/Zifencei as mandatory
extensions in boot services. However, on systems with everything built
with F/D support, its difficult to disable F/D without changing a
toolchain. In addition, both EDK2 and U-Boot enable F/D on boot,
although they neither enable nor disable V. EDK2 comments even claim the
enablement of FPU is "to be compliant with UEFI spec" despite the spec
requires dynamic detection before using F/D.

Add corresponding -march flags to prevent systemd-boot from using other
extensions on RISC-V, and a comment for the temporary enablement of F/D.

Signed-off-by: Icenowy Zheng <zhengxingda@iscas.ac.cn>
---

diff --git a/src/boot/meson.build b/src/boot/meson.build
index d2524145d01..6da1ae6e2f7 100644
--- a/src/boot/meson.build
+++ b/src/boot/meson.build
@@ -270,6 +270,9 @@ efi_arch_c_args = {
         'arm'         : ['-mgeneral-regs-only'],
         # Until -mgeneral-regs-only is supported in LoongArch, use the following option instead:
         'loongarch64' : ['-mno-lsx', '-mno-lasx'],
+        # Assume F/D is usable on RISC-V because they're difficult to disable
+        'riscv32'     : ['-march=rv32imafdc_zicsr_zifencei'],
+        'riscv64'     : ['-march=rv64imafdc_zicsr_zifencei'],
         # Pass -m64/32 explicitly to make building on x32 work.
         'x86_64'      : ['-m64', '-march=x86-64', '-mno-red-zone', '-mgeneral-regs-only'],
         'x86'         : ['-m32', '-march=i686', '-mgeneral-regs-only', '-malign-double'],