Revert "overlays: gdb: fix linker api"

nashif · nashif · commit 580075f064b2 · 2025-05-04T18:20:21.000-04:00
This reverts commit 745d51c.
diff --git a/overlays/xtensa_amd_acp_6_0_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_amd_acp_6_0_adsp/gdb/gdb/xtensa-config.c
@@ -112,7 +112,7 @@ const xtensa_mask_t xtensa_mask39 = { 1, xtensa_submask39 };
 
 
 /* Register map.  */
-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)
@@ -430,6 +430,5 @@ xtensa_register_t rmap[] =
             0,0,&xtensa_mask38,0,0,0)
   XTREG_END
 };
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
 
-xtensa_gdbarch_tdep xtensa_tdep (rmap);
+xtensa_gdbarch_tdep xtensa_tdep (rmap);
diff --git a/overlays/xtensa_dc233c/gdb/gdb/xtensa-config.c b/overlays/xtensa_dc233c/gdb/gdb/xtensa-config.c
@@ -75,7 +75,7 @@ const xtensa_mask_t xtensa_mask20 = { 1, xtensa_submask20 };
 
 
 /* Register map.  */
-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,0x0100,pc,          0,0,0,0,0,0)
@@ -242,7 +242,7 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
+
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,0)
diff --git a/overlays/xtensa_espressif_esp32/gdb/gdb/xtensa-config.c b/overlays/xtensa_espressif_esp32/gdb/gdb/xtensa-config.c
@@ -113,7 +113,7 @@ const xtensa_mask_t xtensa_mask39 = { 1, xtensa_submask39 };
 
 
 /* Register map.  */
-xtensa_register_t rmap[] =
+static 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,0x0100,pc,          0,0,0,0,0,0)
@@ -386,5 +386,4 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
 xtensa_gdbarch_tdep xtensa_tdep (rmap);
diff --git a/overlays/xtensa_espressif_esp32s2/gdb/gdb/xtensa-config.c b/overlays/xtensa_espressif_esp32s2/gdb/gdb/xtensa-config.c
@@ -47,7 +47,7 @@ const xtensa_mask_t xtensa_mask6 = { 1, xtensa_submask6 };
 
 
 /* Register map.  */
-xtensa_register_t rmap[] =
+static 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)
@@ -268,6 +268,4 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
-
 xtensa_gdbarch_tdep xtensa_tdep (rmap);
diff --git a/overlays/xtensa_espressif_esp32s3/gdb/gdb/xtensa-config.c b/overlays/xtensa_espressif_esp32s3/gdb/gdb/xtensa-config.c
@@ -119,7 +119,7 @@ const xtensa_mask_t xtensa_mask42 = { 4, xtensa_submask42 };
 
 
 /* Register map.  */
-xtensa_register_t rmap[] =
+static 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)
@@ -492,5 +492,5 @@ xtensa_register_t rmap[] =
             0,0,&xtensa_mask41,0,0,0)
   XTREG_END
 };
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
+
 xtensa_gdbarch_tdep xtensa_tdep (rmap);
diff --git a/overlays/xtensa_intel_ace15_mtpm/gdb/gdb/xtensa-config.c b/overlays/xtensa_intel_ace15_mtpm/gdb/gdb/xtensa-config.c
@@ -111,7 +111,7 @@ const xtensa_mask_t xtensa_mask38 = { 1, xtensa_submask38 };
 
 
 /* Register map.  */
-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)
@@ -429,7 +429,7 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
+
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,16)
diff --git a/overlays/xtensa_intel_ace30_ptl/gdb/gdb/xtensa-config.c b/overlays/xtensa_intel_ace30_ptl/gdb/gdb/xtensa-config.c
@@ -133,7 +133,7 @@ const xtensa_mask_t xtensa_mask49 = { 1, xtensa_submask49 };
 
 
 /* Register map.  */
-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)
@@ -484,7 +484,7 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
+
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,16)
diff --git a/overlays/xtensa_intel_tgl_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_intel_tgl_adsp/gdb/gdb/xtensa-config.c
@@ -153,7 +153,7 @@ const xtensa_mask_t xtensa_mask59 = { 1, xtensa_submask59 };
 
 
 /* Register map.  */
-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,0x0100,pc,          0,0,0,0,0,0)
@@ -505,7 +505,7 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
+
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,8)
diff --git a/overlays/xtensa_mtk_mt818x_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_mtk_mt818x_adsp/gdb/gdb/xtensa-config.c
@@ -121,7 +121,7 @@ const xtensa_mask_t xtensa_mask43 = { 1, xtensa_submask43 };
 
 
 /* Register map.  */
-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)
@@ -556,7 +556,6 @@ xtensa_register_t rmap[] =
 };
 
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
 xtensa_gdbarch_tdep xtensa_tdep (rmap);
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
diff --git a/overlays/xtensa_mtk_mt8195_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_mtk_mt8195_adsp/gdb/gdb/xtensa-config.c
@@ -496,6 +496,5 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
 
 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
@@ -121,7 +121,7 @@ const xtensa_mask_t xtensa_mask43 = { 1, xtensa_submask43 };
 
 
 /* Register map.  */
-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)
@@ -555,7 +555,6 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
 
 xtensa_gdbarch_tdep xtensa_tdep (rmap);
 
diff --git a/overlays/xtensa_mtk_mt8365_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_mtk_mt8365_adsp/gdb/gdb/xtensa-config.c
@@ -113,7 +113,7 @@ const xtensa_mask_t xtensa_mask39 = { 2, xtensa_submask39 };
 
 
 /* Register map.  */
-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)
@@ -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);
 
diff --git a/overlays/xtensa_nxp_imx8m_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_nxp_imx8m_adsp/gdb/gdb/xtensa-config.c
@@ -109,7 +109,7 @@ const xtensa_mask_t xtensa_mask37 = { 1, xtensa_submask37 };
 
 
 /* Register map.  */
-xtensa_register_t rmap[] =
+static 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,0x0100,pc,          0,0,0,0,0,0)
@@ -352,5 +352,4 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
 xtensa_gdbarch_tdep xtensa_tdep (rmap);
diff --git a/overlays/xtensa_nxp_imx8ulp_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_nxp_imx8ulp_adsp/gdb/gdb/xtensa-config.c
@@ -113,7 +113,7 @@ const xtensa_mask_t xtensa_mask39 = { 2, xtensa_submask39 };
 
 
 /* Register map.  */
-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)
@@ -414,7 +414,7 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
+
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,16)
diff --git a/overlays/xtensa_nxp_imx_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_nxp_imx_adsp/gdb/gdb/xtensa-config.c
@@ -109,7 +109,7 @@ const xtensa_mask_t xtensa_mask37 = { 1, xtensa_submask37 };
 
 
 /* Register map.  */
-xtensa_register_t rmap[] =
+static 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,0x0100,pc,          0,0,0,0,0,0)
@@ -352,5 +352,4 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
 xtensa_gdbarch_tdep xtensa_tdep (rmap);
diff --git a/overlays/xtensa_nxp_rt500_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_nxp_rt500_adsp/gdb/gdb/xtensa-config.c
@@ -117,13 +117,13 @@ const xtensa_mask_t xtensa_mask41 = { 1, xtensa_submask41 };
 
 
 /* Register map.  */
-xtensa_register_t rmap[] =
+xtensa_register_t rmap[] = 
 {
   /*    idx ofs bi sz al targno  flags cp typ group name  */
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
+
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,16)
diff --git a/overlays/xtensa_nxp_rt600_adsp/gdb/gdb/xtensa-config.c b/overlays/xtensa_nxp_rt600_adsp/gdb/gdb/xtensa-config.c
@@ -113,7 +113,7 @@ const xtensa_mask_t xtensa_mask39 = { 2, xtensa_submask39 };
 
 
 /* Register map.  */
-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)
@@ -412,7 +412,7 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
+
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,16)
diff --git a/overlays/xtensa_nxp_rt700_hifi1/gdb/gdb/xtensa-config.c b/overlays/xtensa_nxp_rt700_hifi1/gdb/gdb/xtensa-config.c
@@ -79,7 +79,7 @@ const xtensa_mask_t xtensa_mask22 = { 1, xtensa_submask22 };
 
 
 /* Register map.  */
-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)
@@ -361,7 +361,7 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
+
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,16)
diff --git a/overlays/xtensa_nxp_rt700_hifi4/gdb/gdb/xtensa-config.c b/overlays/xtensa_nxp_rt700_hifi4/gdb/gdb/xtensa-config.c
@@ -115,7 +115,7 @@ const xtensa_mask_t xtensa_mask40 = { 2, xtensa_submask40 };
 
 
 /* Register map.  */
-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)
@@ -439,7 +439,6 @@ xtensa_register_t rmap[] =
 };
 
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,16)
diff --git a/overlays/xtensa_sample_controller/gdb/gdb/xtensa-config.c b/overlays/xtensa_sample_controller/gdb/gdb/xtensa-config.c
@@ -47,7 +47,7 @@ const xtensa_mask_t xtensa_mask6 = { 1, xtensa_submask6 };
 
 
 /* Register map.  */
-xtensa_register_t rmap[] =
+static 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,0x0100,pc,          0,0,0,0,0,0)
@@ -170,5 +170,4 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
 xtensa_gdbarch_tdep xtensa_tdep (rmap);
diff --git a/overlays/xtensa_sample_controller32/gdb/gdb/xtensa-config.c b/overlays/xtensa_sample_controller32/gdb/gdb/xtensa-config.c
@@ -49,7 +49,7 @@ const xtensa_mask_t xtensa_mask7 = { 1, xtensa_submask7 };
 
 
 /* Register map.  */
-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)
@@ -176,10 +176,10 @@ xtensa_register_t rmap[] =
   XTREG_END
 };
 
-extern xtensa_register_t xtensa_rmap[] __attribute__((alias("rmap")));
+
 
 #ifdef XTENSA_CONFIG_INSTANTIATE
 XTENSA_CONFIG_INSTANTIATE(rmap,0)
 #endif
 
-xtensa_gdbarch_tdep xtensa_tdep (rmap);
+xtensa_gdbarch_tdep xtensa_tdep (rmap);
