This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] gdbarch.h: Change gdbarch_info::tdep_info's type to void *
- From: Simon Marchi <simark at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 30 Sep 2015 15:25:33 -0000
- Subject: [binutils-gdb] gdbarch.h: Change gdbarch_info::tdep_info's type to void *
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ede5f15146ae45f4c017f5701629a4fa04ef2beb
commit ede5f15146ae45f4c017f5701629a4fa04ef2beb
Author: Simon Marchi <simon.marchi@ericsson.com>
Date: Wed Sep 30 11:21:52 2015 -0400
gdbarch.h: Change gdbarch_info::tdep_info's type to void *
As reported by Ulrich here:
https://sourceware.org/ml/gdb-patches/2015-09/msg00604.html
The system compiler (gcc 4.1) in Centos 5 doesn't like that we cast to a
pointer to a type that doesn't exist. I see no real value in using this
kind iof construct over just using void *. So this patch changes the
tdep_info field to void * and removes the casts. Even in C++, we
should not need an explicit cast when assigning to a void *.
gdb/ChangeLog:
* gdbarch.sh (struct gdbarch_info): Change tdep_info's type to void *.
* gdbarch.h: Regenerate.
* i386-tdep.c (i386_gdbarch_init): Remove cast to
struct gdbarch_tdep_info *.
* mips-tdep.c (mips_gdbarch_init): Likewise.
* ppc-linux-tdep (ppu2spu_sniffer): Likewise.
* rs6000-tdep.c (rs6000_gdbarch_init): Likewise.
* spu-multiarch.c (spu_gdbarch): Likewise.
Diff:
---
gdb/ChangeLog | 11 +++++++++++
gdb/gdbarch.h | 2 +-
gdb/gdbarch.sh | 2 +-
gdb/i386-tdep.c | 2 +-
gdb/mips-tdep.c | 2 +-
gdb/ppc-linux-tdep.c | 2 +-
gdb/rs6000-tdep.c | 2 +-
gdb/spu-multiarch.c | 2 +-
8 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a47f3d9..3d883a1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2015-09-30 Simon Marchi <simon.marchi@ericsson.com>
+
+ * gdbarch.sh (struct gdbarch_info): Change tdep_info's type to void *.
+ * gdbarch.h: Regenerate.
+ * i386-tdep.c (i386_gdbarch_init): Remove cast to
+ struct gdbarch_tdep_info *.
+ * mips-tdep.c (mips_gdbarch_init): Likewise.
+ * ppc-linux-tdep (ppu2spu_sniffer): Likewise.
+ * rs6000-tdep.c (rs6000_gdbarch_init): Likewise.
+ * spu-multiarch.c (spu_gdbarch): Likewise.
+
2015-09-30 Kevin Buettner <kevinb@redhat.com>
* infcmd.c (finish_command_fsm_should_stop): Don't attempt to
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 82e0259..2e4ed3e 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -1561,7 +1561,7 @@ struct gdbarch_info
bfd *abfd;
/* Use default: NULL (ZERO). */
- struct gdbarch_tdep_info *tdep_info;
+ void *tdep_info;
/* Use default: GDB_OSABI_UNINITIALIZED (-1). */
enum gdb_osabi osabi;
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 388920f..a13d9b9 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1429,7 +1429,7 @@ struct gdbarch_info
bfd *abfd;
/* Use default: NULL (ZERO). */
- struct gdbarch_tdep_info *tdep_info;
+ void *tdep_info;
/* Use default: GDB_OSABI_UNINITIALIZED (-1). */
enum gdb_osabi osabi;
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 2ac2f15..92f60fd 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -8478,7 +8478,7 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
set_gdbarch_insn_is_jump (gdbarch, i386_insn_is_jump);
/* Hook in ABI-specific overrides, if they have been registered. */
- info.tdep_info = (struct gdbarch_tdep_info *) tdesc_data;
+ info.tdep_info = tdesc_data;
gdbarch_init_osabi (info, gdbarch);
if (!i386_validate_tdesc_p (tdep, tdesc_data))
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 388513e..2275138 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -8898,7 +8898,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
mips_register_g_packet_guesses (gdbarch);
/* Hook in OS ABI-specific overrides, if they have been registered. */
- info.tdep_info = (struct gdbarch_tdep_info *) tdesc_data;
+ info.tdep_info = tdesc_data;
gdbarch_init_osabi (info, gdbarch);
/* The hook may have adjusted num_regs, fetch the final value and
diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index ae5edc2..460c503 100644
--- a/gdb/ppc-linux-tdep.c
+++ b/gdb/ppc-linux-tdep.c
@@ -1352,7 +1352,7 @@ ppu2spu_sniffer (const struct frame_unwind *self,
info.bfd_arch_info = bfd_lookup_arch (bfd_arch_spu, bfd_mach_spu);
info.byte_order = BFD_ENDIAN_BIG;
info.osabi = GDB_OSABI_LINUX;
- info.tdep_info = (struct gdbarch_tdep_info *) &data.id;
+ info.tdep_info = &data.id;
data.gdbarch = gdbarch_find_by_info (info);
if (!data.gdbarch)
return 0;
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index b37e862..baf6b67 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -5993,7 +5993,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
/* Hook in ABI-specific overrides, if they have been registered. */
info.target_desc = tdesc;
- info.tdep_info = (struct gdbarch_tdep_info *) tdesc_data;
+ info.tdep_info = tdesc_data;
gdbarch_init_osabi (info, gdbarch);
switch (info.osabi)
diff --git a/gdb/spu-multiarch.c b/gdb/spu-multiarch.c
index c61b271..73acdae 100644
--- a/gdb/spu-multiarch.c
+++ b/gdb/spu-multiarch.c
@@ -107,7 +107,7 @@ spu_gdbarch (int spufs_fd)
info.bfd_arch_info = bfd_lookup_arch (bfd_arch_spu, bfd_mach_spu);
info.byte_order = BFD_ENDIAN_BIG;
info.osabi = GDB_OSABI_LINUX;
- info.tdep_info = (struct gdbarch_tdep_info *) &spufs_fd;
+ info.tdep_info = &spufs_fd;
return gdbarch_find_by_info (info);
}