diff --git a/cmake/arch.cmake b/cmake/arch.cmake
index 27c5650ab..5f3703ae0 100644
--- a/cmake/arch.cmake
+++ b/cmake/arch.cmake
@@ -57,7 +57,11 @@ if (DYNAMIC_ARCH)
 	  set(DYNAMIC_CORE POWER6 POWER8 POWER9 POWER10)
 	  set(CCOMMON_OPT "${CCOMMON_OPT} -DHAVE_P10_SUPPORT")
   endif ()
-  
+ 
+  if (RISCV64)
+	  set(DYNAMIC_CORE RISCV64_GENERIC RISCV64_ZVL128B RISCV64_ZVL256B) 
+  endif ()
+
   if (X86)
     set(DYNAMIC_CORE KATMAI COPPERMINE NORTHWOOD PRESCOTT BANIAS CORE2 PENRYN DUNNINGTON NEHALEM ATHLON OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO)
   endif ()
diff --git a/cmake/system.cmake b/cmake/system.cmake
index a3f7fd173..031e876ab 100644
--- a/cmake/system.cmake
+++ b/cmake/system.cmake
@@ -391,7 +391,7 @@ endif ()
 if (X86_64 OR ${CORE} STREQUAL POWER10)
   set(SMALL_MATRIX_OPT TRUE)
 endif ()
-if (ARM64 OR RISCV64 OR POWER)
+if (ARM64)
   set(GEMM_GEMV_FORWARD TRUE)
 endif ()
 
@@ -403,7 +403,7 @@ if (SMALL_MATRIX_OPT)
 endif ()
 
 if (DYNAMIC_ARCH)
-  if (X86 OR X86_64 OR ARM64 OR POWER)
+  if (X86 OR X86_64 OR ARM64 OR POWER OR RISCV64)
     set(CCOMMON_OPT "${CCOMMON_OPT} -DDYNAMIC_ARCH")
     if (DYNAMIC_OLDER)
       set(CCOMMON_OPT "${CCOMMON_OPT} -DDYNAMIC_OLDER")