Merge remote-tracking branch 'xilinx/rel-v2024.1' into HEAD

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

2 files changed, 34 insertions, 0 deletions

diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc b/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc
index 5eae0577..d3618229 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc
@@ -13,4 +13,5 @@ SRC_URI:append:microblaze = " \
      file://0006-Patch-MicroBlaze-these-changes-will-make-64-bit-vect.patch \
      file://0007-Patch-MicroBlaze-Added-m64-abi-for-64-bit-target-des.patch \
      file://0008-Patch-MicroBlaze.patch \
+     file://0009-gdb-gdserver-Fix-ABI-settings-for-gdbserver.patch \
      "
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0009-gdb-gdserver-Fix-ABI-settings-for-gdbserver.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0009-gdb-gdserver-Fix-ABI-settings-for-gdbserver.patch
new file mode 100644
index 00000000..93f67800
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0009-gdb-gdserver-Fix-ABI-settings-for-gdbserver.patch
@@ -0,0 +1,33 @@
+From 53b76bb548720367032a51a6d604c975b10bb30e Mon Sep 17 00:00:00 2001
+From: Aayush Misra <aayushm@amd.com>
+Date: Fri, 29 Mar 2024 14:59:16 +0530
+Subject: [PATCH] gdb/gdserver: Fix ABI settings for gdbserver
+
+---
+ gdb/microblaze-tdep.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
+index 38ba38e8c7d..35cec286d8f 100644
+--- a/gdb/microblaze-tdep.c
++++ b/gdb/microblaze-tdep.c
+@@ -1120,12 +1120,13 @@ void _initialize_microblaze_tdep ();
+ void
+ _initialize_microblaze_tdep ()
+ {
++  //Setting abi to auto manually, should be able to modify in 'arch'_gdbarch_init function
++  microblaze_abi_string = microblaze_abi_strings[0]; 
++
+   register_gdbarch_init (bfd_arch_microblaze, microblaze_gdbarch_init);
+-// static struct cmd_list_element *setmicroblazecmdlist = NULL;
+-// static struct cmd_list_element *showmicroblazecmdlist = NULL;
+ 
+-  /* Add root prefix command for all "set microblaze"/"show microblaze" commands.  */
+ 
++  /* Add root prefix command for all "set microblaze"/"show microblaze" commands.  */
+   add_setshow_prefix_cmd ("microblaze", no_class,
+                         _("Various microblaze specific commands."),
+                         _("Various microblaze specific commands."),
+-- 
+2.34.1
+