RT-Thread
diff --git a/‎libcpu/risc-v/SConscript
+4-5 b/‎libcpu/risc-v/SConscript
+4-5
diff --git a/‎libcpu/risc-v/common64/SConscript
+9 b/‎libcpu/risc-v/common64/SConscript
+9
diff --git a/‎libcpu/risc-v/t-head/c906/asm-generic.h renamed to ‎libcpu/risc-v/common64/asm-generic.h b/‎libcpu/risc-v/t-head/c906/asm-generic.h renamed to ‎libcpu/risc-v/common64/asm-generic.h
diff --git a/‎libcpu/risc-v/t-head/c906/backtrace.c renamed to ‎libcpu/risc-v/common64/backtrace.c b/‎libcpu/risc-v/t-head/c906/backtrace.c renamed to ‎libcpu/risc-v/common64/backtrace.c
diff --git a/‎libcpu/risc-v/t-head/c906/mmu.h renamed to ‎libcpu/risc-v/common64/mmu.h b/‎libcpu/risc-v/t-head/c906/mmu.h renamed to ‎libcpu/risc-v/common64/mmu.h
diff --git a/‎libcpu/risc-v/t-head/c906/riscv.h renamed to ‎libcpu/risc-v/common64/riscv.h b/‎libcpu/risc-v/t-head/c906/riscv.h renamed to ‎libcpu/risc-v/common64/riscv.h
diff --git a/‎libcpu/risc-v/t-head/c906/syscall_c.c renamed to ‎libcpu/risc-v/common64/syscall_c.c b/‎libcpu/risc-v/t-head/c906/syscall_c.c renamed to ‎libcpu/risc-v/common64/syscall_c.c
diff --git a/‎libcpu/risc-v/virt64/asm-generic.h
-26 b/‎libcpu/risc-v/virt64/asm-generic.h
-26
diff --git a/‎libcpu/risc-v/virt64/backtrace.c
-125 b/‎libcpu/risc-v/virt64/backtrace.c
-125
diff --git a/‎libcpu/risc-v/virt64/mmu.h
-77 b/‎libcpu/risc-v/virt64/mmu.h
-77
diff --git a/‎libcpu/risc-v/virt64/riscv.h
-29 b/‎libcpu/risc-v/virt64/riscv.h
-29
diff --git a/‎libcpu/risc-v/virt64/syscall_c.c
-62 b/‎libcpu/risc-v/virt64/syscall_c.c
-62
@@ -5,17 +5,16 @@ from building import *
 
 Import('rtconfig')
 
+common64_arch = ['virt64', 'c906']
 cwd   = GetCurrentDir()
 group = []
 list  = os.listdir(cwd)
 
 # add common code files
-if   rtconfig.CPU == "virt64" :
-    group = group
-elif rtconfig.CPU == "c906" :
-    group = group
+if rtconfig.CPU in common64_arch :
+    group += SConscript(os.path.join('common64', 'SConscript'))
 else :
-    group = group + SConscript(os.path.join('common', 'SConscript'))
+    group += SConscript(os.path.join('common', 'SConscript'))
 
 # cpu porting code files
 if  rtconfig.CPU == "c906":
 
@@ -0,0 +1,9 @@
+from building import *
+
+cwd     = GetCurrentDir()
+src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
+CPPPATH = [cwd]
+
+group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
+
+Return('group')