diff --git a/overlays/xtensa_mtk_mt818x_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_mtk_mt818x_adsp/gdb/gdb/xtensa-config.c
index beaf6464..7ffe1517 100644
--- a/overlays/xtensa_mtk_mt818x_adsp/gdb/gdb/xtensa-config.c
+++ b/overlays/xtensa_mtk_mt818x_adsp/gdb/gdb/xtensa-config.c
@@ -556,6 +556,7 @@ xtensa_register_t rmap[] =
 };
 
 
+xtensa_gdbarch_tdep xtensa_tdep (rmap);
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,16)
diff --git a/overlays/xtensa_mtk_mt8195_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_mtk_mt8195_adsp/gdb/gdb/xtensa-config.c
index 9d106c9f..36b5e372 100644
--- a/overlays/xtensa_mtk_mt8195_adsp/gdb/gdb/xtensa-config.c
+++ b/overlays/xtensa_mtk_mt8195_adsp/gdb/gdb/xtensa-config.c
@@ -113,7 +113,7 @@ const xtensa_mask_t xtensa_mask39 = { 1, xtensa_submask39 };
 
 
 /* Register map.  */
-static xtensa_register_t rmap[] =
+xtensa_register_t rmap[] =
 {
   /*    idx ofs bi sz al targno  flags cp typ group name  */
   XTREG(  0,  0,32, 4, 4,0x0020,0x0006,-2, 9,0x2100,pc,          0,0,0,0,0,0)
@@ -496,4 +496,5 @@ static xtensa_register_t rmap[] =
   XTREG_END
 };
 
+
 xtensa_gdbarch_tdep xtensa_tdep (rmap);
diff --git a/overlays/xtensa_mtk_mt8196_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_mtk_mt8196_adsp/gdb/gdb/xtensa-config.c
index 464661f2..286fc5ac 100644
--- a/overlays/xtensa_mtk_mt8196_adsp/gdb/gdb/xtensa-config.c
+++ b/overlays/xtensa_mtk_mt8196_adsp/gdb/gdb/xtensa-config.c
@@ -556,6 +556,7 @@ xtensa_register_t rmap[] =
 };
 
 
+xtensa_gdbarch_tdep xtensa_tdep (rmap);
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,16)
diff --git a/overlays/xtensa_mtk_mt8365_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_mtk_mt8365_adsp/gdb/gdb/xtensa-config.c
index ef1c2e7a..bc0aebb0 100644
--- a/overlays/xtensa_mtk_mt8365_adsp/gdb/gdb/xtensa-config.c
+++ b/overlays/xtensa_mtk_mt8365_adsp/gdb/gdb/xtensa-config.c
@@ -500,7 +500,6 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
 
 xtensa_gdbarch_tdep xtensa_tdep (rmap);