Merge the vdso.c of different architectures

Author: ScuDays

components/lwp/SConscript

@@ -25,11 +25,14 @@ if platform in platform_file.keys(): # support platforms
     if arch in support_arch.keys() and cpu in support_arch[arch]:
         asm_path = 'arch/' + arch + '/' + cpu + '/*_' + platform_file[platform]
         arch_common = 'arch/' + arch + '/' + 'common/*.c'
+        common = 'arch/common/*.c'
         if not GetDepend('RT_USING_VDSO'):
             vdso_files = ['vdso_data.c', 'vdso.c']
             src += [f for f in Glob(arch_common) if os.path.basename(str(f)) not in vdso_files]
+            src += [f for f in Glob(common) if os.path.basename(str(f)) not in vdso_files]
         else:
             src += Glob(arch_common)
+            src += Glob(common)
         if not GetDepend('ARCH_MM_MMU'):
             excluded_files = ['ioremap.c', 'lwp_futex.c', 'lwp_mm_area.c', 'lwp_pmutex.c', 'lwp_shm.c', 'lwp_user_mm.c']
             src += [f for f in Glob('*.c') if os.path.basename(str(f)) not in excluded_files] + Glob(asm_path)

components/lwp/arch/aarch64/common/vdso.c

@@ -20,7 +20,7 @@
 
 enum vdso_abi
 {
-    VDSO_ABI_RV64,
+    VDSO_ABI_COMMON,
 };
 
 enum vvar_pages
@@ -40,8 +40,8 @@ struct vdso_abi_info
 };
 
 static struct vdso_abi_info vdso_info[] = {
-    [VDSO_ABI_RV64] = {
-                       .name            = "vdso_riscv64",
+    [VDSO_ABI_COMMON] = {
+                       .name            = "vdso_common",
                        .vdso_code_start = __vdso_text_start,
                        .vdso_code_end   = __vdso_text_end,
                        },
@@ -86,7 +86,7 @@ int arch_setup_additional_pages(struct rt_lwp *lwp)
 {
     int ret;
     if (init_ret_flag != RT_EOK) return -RT_ERROR;
-    ret = __setup_additional_pages(VDSO_ABI_RV64, lwp);
+    ret = __setup_additional_pages(VDSO_ABI_COMMON, lwp);
 
     return ret;
 }
@@ -101,13 +101,13 @@ static void __initdata(void)
 
 static int validate_vdso_elf(void)
 {
-    if (rt_memcmp(vdso_info[VDSO_ABI_RV64].vdso_code_start, ELF_HEAD, ELF_HEAD_LEN))
+    if (rt_memcmp(vdso_info[VDSO_ABI_COMMON].vdso_code_start, ELF_HEAD, ELF_HEAD_LEN))
     {
         LOG_E("vDSO is not a valid ELF object!");
         init_ret_flag = -RT_ERROR;
         return -RT_ERROR;
     }
-    vdso_info[VDSO_ABI_RV64].vdso_pages = (vdso_info[VDSO_ABI_RV64].vdso_code_end - vdso_info[VDSO_ABI_RV64].vdso_code_start) >> ARCH_PAGE_SHIFT;
+    vdso_info[VDSO_ABI_COMMON].vdso_pages = (vdso_info[VDSO_ABI_COMMON].vdso_code_end - vdso_info[VDSO_ABI_COMMON].vdso_code_start) >> ARCH_PAGE_SHIFT;
 
     __initdata();
     return RT_EOK;