[PATCH 09/24] gdb: rename lm_info_base to lm_info

Simon Marchi
2023-10-10T20:44:31Z

The base class doesn't need to have "_base" in its name, all the
sub-classes have a specific suffix.

Change-Id: I87652105cfedd87898770a81f0eda343ff7f2bdb
---
gdb/solib-aix.c | 2 +-
gdb/solib-darwin.c | 2 +-
gdb/solib-dsbt.c | 2 +-
gdb/solib-frv.c | 2 +-
gdb/solib-svr4.h | 2 +-
gdb/solib-target.c | 2 +-
gdb/solist.h | 4 ++--
7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c
index 515d9d62704a..7e7333e20dd1 100644
--- a/gdb/solib-aix.c
+++ b/gdb/solib-aix.c
@@ -28,7 +28,7 @@

/* Our private data in struct so_list. */

-struct lm_info_aix : public lm_info_base
+struct lm_info_aix : public lm_info
{
/* The name of the file mapped by the loader. Apart from the entry
for the main executable, this is usually a shared library (which,
diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index c2f250ae705c..2ca2d533a9b4 100644
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -135,7 +135,7 @@ darwin_load_image_infos (struct darwin_info *info)

/* Link map info to include in an allocated so_list entry. */

-struct lm_info_darwin : public lm_info_base
+struct lm_info_darwin : public lm_info
{
/* The target location of lm. */
CORE_ADDR lm_addr = 0;
diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c
index dd0c8e47d086..5458ef51571a 100644
--- a/gdb/solib-dsbt.c
+++ b/gdb/solib-dsbt.c
@@ -123,7 +123,7 @@ struct dbst_ext_link_map

/* Link map info to include in an allocated so_list entry */

-struct lm_info_dsbt : public lm_info_base
+struct lm_info_dsbt : public lm_info
{
~lm_info_dsbt ()
{
diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index f823aca57fa0..caf8a9a87701 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -196,7 +196,7 @@ struct ext_link_map

/* Link map info to include in an allocated so_list entry. */

-struct lm_info_frv : public lm_info_base
+struct lm_info_frv : public lm_info
{
~lm_info_frv ()
{
diff --git a/gdb/solib-svr4.h b/gdb/solib-svr4.h
index ff15603476ed..050c702f620b 100644
--- a/gdb/solib-svr4.h
+++ b/gdb/solib-svr4.h
@@ -29,7 +29,7 @@ extern const struct target_so_ops svr4_so_ops;

/* Link map info to include in an allocated so_list entry. */

-struct lm_info_svr4 : public lm_info_base
+struct lm_info_svr4 : public lm_info
{
/* Amount by which addresses in the binary should be relocated to
match the inferior. The direct inferior value is L_ADDR_INFERIOR.
diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index d2459b5dc81b..8e6a440c4673 100644
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -28,7 +28,7 @@
#include "inferior.h"

/* Private data for each loaded library. */
-struct lm_info_target : public lm_info_base
+struct lm_info_target : public lm_info
{
/* The library's name. The name is normally kept in the struct
so_list; it is only here during XML parsing. */
diff --git a/gdb/solist.h b/gdb/solist.h
index 8b80ed4a6cc7..51b1ceb0398e 100644
--- a/gdb/solist.h
+++ b/gdb/solist.h
@@ -27,7 +27,7 @@

/* Base class for target-specific link map information. */

-struct lm_info_base
+struct lm_info
{
};

@@ -43,7 +43,7 @@ struct so_list
will be a copy of struct link_map from the user process, but
it need not be; it can be any collection of data needed to
traverse the dynamic linker's data structures. */
- lm_info_base *lm_info = nullptr;
+ struct lm_info *lm_info = nullptr;

/* Shared object file name, exactly as it appears in the
inferior's link map. This may be a relative path, or something
--
2.42.0