Index: head/share/mk/bsd.stand.mk
===================================================================
--- head/share/mk/bsd.stand.mk
+++ head/share/mk/bsd.stand.mk
@@ -8,7 +8,7 @@
 CFLAGS+= ${CFLAGS_NO_SIMD} -D_STANDALONE
 .if ${MACHINE_CPUARCH} == "riscv"
 CFLAGS+=	-mno-float
-.else
+.elif ${MACHINE_CPUARCH} != "aarch64"
 CFLAGS+=	-msoft-float
 .endif
 
Index: head/sys/boot/efi/Makefile.inc
===================================================================
--- head/sys/boot/efi/Makefile.inc
+++ head/sys/boot/efi/Makefile.inc
@@ -9,9 +9,13 @@
 
 # Options used when building app-specific efi components
 # See conf/kern.mk for the correct set of these
-CFLAGS+=	-ffreestanding -Wformat -msoft-float ${CFLAGS_NO_SIMD}
+CFLAGS+=	-ffreestanding -Wformat ${CFLAGS_NO_SIMD}
 LDFLAGS+=	-nostdlib
 
+.if ${MACHINE_CPUARCH} != "aarch64"
+CFLAGS+=	-msoft-float
+.endif
+
 .if ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-fshort-wchar
 CFLAGS+=	-mno-red-zone
Index: head/sys/boot/efi/boot1/Makefile
===================================================================
--- head/sys/boot/efi/boot1/Makefile
+++ head/sys/boot/efi/boot1/Makefile
@@ -71,7 +71,7 @@
 LDFLAGS+=	-Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared
 
 .if ${MACHINE_CPUARCH} == "aarch64"
-CFLAGS+=	-msoft-float -mgeneral-regs-only
+CFLAGS+=	-mgeneral-regs-only
 .endif
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=	-fPIC
Index: head/sys/boot/efi/fdt/Makefile
===================================================================
--- head/sys/boot/efi/fdt/Makefile
+++ head/sys/boot/efi/fdt/Makefile
@@ -10,9 +10,11 @@
 
 SRCS=		efi_fdt.c
 
-CFLAGS+=	-ffreestanding -msoft-float
+CFLAGS+=	-ffreestanding
 .if ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-mgeneral-regs-only
+.else
+CFLAGS+=	-msoft-float
 .endif
 
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
Index: head/sys/boot/efi/libefi/Makefile
===================================================================
--- head/sys/boot/efi/libefi/Makefile
+++ head/sys/boot/efi/libefi/Makefile
@@ -30,7 +30,7 @@
 CWARNFLAGS.env.c+=	-Wno-format
 
 .if ${MACHINE_CPUARCH} == "aarch64"
-CFLAGS+=	-msoft-float -mgeneral-regs-only
+CFLAGS+=	-mgeneral-regs-only
 .endif
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+= -fPIC -mno-red-zone
Index: head/sys/boot/efi/loader/arch/arm64/Makefile.inc
===================================================================
--- head/sys/boot/efi/loader/arch/arm64/Makefile.inc
+++ head/sys/boot/efi/loader/arch/arm64/Makefile.inc
@@ -8,7 +8,7 @@
 CFLAGS+=-I${.CURDIR}/../../arm64/libarm64
 SRCS+=	cache.c
 
-CFLAGS+=	-msoft-float -mgeneral-regs-only
+CFLAGS+=	-mgeneral-regs-only
 
 CLEANFILES+=	loader.help