diff --git a/utils/uds/atomicDefs.h b/utils/uds/atomicDefs.h
index f468369..673f974 100644
--- a/utils/uds/atomicDefs.h
+++ b/utils/uds/atomicDefs.h
@@ -99,6 +99,8 @@
   __asm__ __volatile__("sync" : : : "memory");
 #elif defined __loongarch64
   __asm__ __volatile__("dbar 0" : : : "memory");
+#elif defined __riscv
+  __asm__ __volatile__("fence rw,rw" : : : "memory");
 #else
 #error "no fence defined"
 #endif
@@ -126,6 +128,8 @@
   __asm__ __volatile__("lwsync" : : : "memory");
 #elif defined __loongarch64
   __asm__ __volatile__("dbar 0" : : : "memory");
+#elif defined __riscv
+  __asm__ __volatile__("fence r,r" : : : "memory");
 #else
 #error "no fence defined"
 #endif
@@ -153,6 +157,8 @@
   __asm__ __volatile__("lwsync" : : : "memory");
 #elif defined __loongarch64
   __asm__ __volatile__("dbar 0" : : : "memory");
+#elif defined __riscv
+  __asm__ __volatile__("fence w,w" : : : "memory");
 #else
 #error "no fence defined"
 #endif
diff --git a/utils/uds/cpu.h b/utils/uds/cpu.h
index e26d653..f3fd61f 100644
--- a/utils/uds/cpu.h
+++ b/utils/uds/cpu.h
@@ -36,7 +36,7 @@
 #define CACHE_LINE_BYTES 128
 #elif defined(__s390x__)
 #define CACHE_LINE_BYTES 256
-#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64)
+#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64)  || defined(__riscv)
 #define CACHE_LINE_BYTES 64
 #else
 #error "unknown cache line size"
diff --git a/utils/uds/Makefile b/utils/uds/Makefile
index e33d682..ff6ece0 100644
--- a/utils/uds/Makefile
+++ b/utils/uds/Makefile
@@ -32,8 +32,11 @@
   CC=gcc
 endif
 
+ifeq ($(filter riscv64%,$(MAKE_HOST)),)
+Wcast-align = -Wcast-align
+endif
 WARNS =	-Wall			\
-	-Wcast-align		\
+	$(Wcast-align)		\
 	-Werror			\
 	-Wextra			\
 	-Winit-self		\
diff --git a/utils/vdo/Makefile b/utils/vdo/Makefile
index fb009a7..26a8e28 100644
--- a/utils/vdo/Makefile
+++ b/utils/vdo/Makefile
@@ -22,10 +22,12 @@
 
 UDS_DIR      = ../uds
 
-
+ifeq ($(filter riscv64%,$(MAKE_HOST)),)
+Wcast-align = -Wcast-align
+endif
 WARNS            =				\
 		   -Wall			\
-		   -Wcast-align			\
+		   $(Wcast-align)			\
 		   -Werror			\
 		   -Wextra			\
 		   -Winit-self			\