diff --git a/Makefile b/Makefile
index 2e90e4801525..075c79a55b69 100644
--- a/Makefile
+++ b/Makefile
@@ -488,7 +488,8 @@ TARGET_ARCHES_arm?=	arm armv6 armv7
 TARGET_ARCHES_arm64?=	aarch64
 TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32 mipselhf mipshf mips64elhf mips64hf
 TARGET_ARCHES_powerpc?=	powerpc powerpc64 powerpcspe
-TARGET_ARCHES_riscv?=	riscv64 riscv64sf
+# riscv64sf excluded due to PR 232085
+TARGET_ARCHES_riscv?=	riscv64
 .for target in ${TARGETS}
 TARGET_ARCHES_${target}?= ${target}
 .endfor