diff --git a/src/cm_concurrency/cm_spinlock.h b/src/cm_concurrency/cm_spinlock.h
index 6045291ff153e99d0ebdc71a6aa207e70059f9bd..40f14fe9a66180dcea62817a895575758ca02902 100644
--- a/src/cm_concurrency/cm_spinlock.h
+++ b/src/cm_concurrency/cm_spinlock.h
@@ -77,7 +77,7 @@ typedef struct st_spin_statis_instance {
     uint64 ss_wait_usecs;
 } spin_statis_instance_t;
 
-#if defined(__arm__) || defined(__aarch64__) || defined(__loongarch__)
+#if defined(__arm__) || defined(__aarch64__) || defined(__loongarch__) || defined(__riscv)
 #define fas_cpu_pause()          \
     {                            \
         __asm__ volatile("nop"); \
diff --git a/src/cm_concurrency/cm_thread.c b/src/cm_concurrency/cm_thread.c
index fa9dd5f6fe6c86ea357b3e1fb05d8f24a705a99f..21fe59d47ae5cb307e1efe0a86996bcd8e07c95b 100644
--- a/src/cm_concurrency/cm_thread.c
+++ b/src/cm_concurrency/cm_thread.c
@@ -303,7 +303,7 @@ uint32 cm_get_current_thread_id(void)
 #define __SYS_GET_SPID 186
 #elif (defined __aarch64__)
 #define __SYS_GET_SPID 178
-#elif (defined __loongarch__)
+#elif (defined __loongarch__) || (defined __riscv)
 #include<sys/syscall.h>
 #define __SYS_GET_SPID SYS_gettid
 #endif
diff --git a/src/cm_utils/cm_memory.h b/src/cm_utils/cm_memory.h
index 5d86863dbe02156804e2f1aed4f0d0975451e88b..66119b45dd323885591fafe4580eb4801a6dbf0b 100644
--- a/src/cm_utils/cm_memory.h
+++ b/src/cm_utils/cm_memory.h
@@ -63,7 +63,7 @@ extern "C" {
         __asm__ volatile("mfence" ::      \
                              : "memory"); \
     }
-#elif defined(__loongarch__)
+#elif defined(__loongarch__) || defined(__riscv)
 #define CM_MFENCE                         \
     {                                     \
         __asm__ volatile("" ::            \