From ab25d9bbe4a04aefb47d2514b4b02e6035ff769e Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 25 Jul 2022 12:07:11 +0100 Subject: gdb: rename gdbarch_tdep struct to fix g++ 4.8 build After the commit: commit 08106042d9f5fdff60c129bf33190639f1a98b2a Date: Thu May 19 13:20:17 2022 +0100 gdb: move the type cast into gdbarch_tdep GDB would no longer build using g++ 4.8. The issue appears to be some confusion caused by GDB having 'struct gdbarch_tdep', but also a templated function called 'gdbarch_tdep'. Prior to the above commit the gdbarch_tdep function was not templated, and this compiled just fine. Note that the above commit compiles just fine with later versions of g++, so this issue was clearly fixed at some point, though I've not tried to track down exactly when. In this commit I propose to fix the g++ 4.8 build problem by renaming 'struct gdbarch_tdep' to 'struct gdbarch_tdep_base'. This rename better represents that the struct is only ever used as a base class, and removes the overloading of the name, which allows GDB to build with g++ 4.8. I've also updated the comment on 'struct gdbarch_tdep_base' to fix a typo, and the comment on the 'gdbarch_tdep' function, to mention that in maintainer mode a run-time type check is performed. --- gdb/arm-tdep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gdb/arm-tdep.h') diff --git a/gdb/arm-tdep.h b/gdb/arm-tdep.h index 0fc4774..67dd115 100644 --- a/gdb/arm-tdep.h +++ b/gdb/arm-tdep.h @@ -87,7 +87,7 @@ enum struct_return }; /* Target-dependent structure in gdbarch. */ -struct arm_gdbarch_tdep : gdbarch_tdep +struct arm_gdbarch_tdep : gdbarch_tdep_base { /* The ABI for this architecture. It should never be set to ARM_ABI_AUTO. */ -- cgit v1.1