From: Tom Tromey <tromey@adacore.com>
Date: Mon, 8 Aug 2022 15:56:47 +0000 (-0600)
Subject: Fix regression from gdbarch registry change
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce81f9d6fa885a3faa41613debc8771304dc469b;p=binutils-gdb.git

Fix regression from gdbarch registry change

The gdbarch registry patch introduced a regression that could cause a
crash when opening files in gdb.  The bug is that, previously, the
solib ops would default to current_target_so_ops; but the patch
changed this code to default to nullptr.  This patch fixes the bug by
reintroducing the earlier behavior.  This is PR gdb/29449.

I managed to reproduce the bug with a riscv-elf build and then
verified that this fixes the problem.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29449
---

diff --git a/gdb/solib.c b/gdb/solib.c
index d889673dabf..25adf586a02 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -64,7 +64,13 @@ static const registry<gdbarch>::key<const struct target_so_ops,
 static const struct target_so_ops *
 solib_ops (struct gdbarch *gdbarch)
 {
-  return solib_data.get (gdbarch);
+  const struct target_so_ops *result = solib_data.get (gdbarch);
+  if (result == nullptr)
+    {
+      result = current_target_so_ops;
+      set_solib_ops (gdbarch, current_target_so_ops);
+    }
+  return result;
 }
 
 /* Set the solib operations for GDBARCH to NEW_OPS.  */