diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index d49d108f43..e7dc2235ee 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -48,6 +48,11 @@ rule ArchitectureSetup architecture
 		# TODO: These should be included in Clang's compiler specs.
 		ccBaseFlags += -fPIC ;
 		HAIKU_LINKFLAGS_$(architecture) += -shared ;
+
+		# lld doesn't currently implement R_RISCV_ALIGN relaxation
+		if $(cpu) = riscv64 {
+			ccBaseFlags += -mno-relax ;
+		}
 	}
 	ccBaseFlags += $(archFlags) ;