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 --git a/gdb/ChangeLog b/gdb/ChangeLog
index a47f3d9752eff5df6574563fb4b31fcd1326805c..3d883a1327e488fb55a6355f3682fb2705037f48 100644 (file)
--- 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 82e025956b81ea08c92b27686594f896f8012658..2e4ed3e3c5a955e111ed3dbed7e416fa47014e1c 100644 (file)
--- 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 388920fd1b5a5196cadc5490fd4f131036af596e..a13d9b965f4d7660fdccb9c3730582278e6fef1a 100755 (executable)
--- 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 2ac2f151730ed3cd7f3af9951599c47c3c484f36..92f60fd873160f9819ec2cc6fce1c7f0d4a2a2dd 100644 (file)
--- 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 388513ee83a37c3c80c60b5c13ef22b0a148014f..2275138001cb80ee44042f5958032ea605a1efc3 100644 (file)
--- 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 ae5edc2845e05980796f978b28e8eb0649e9462b..460c503fae1bb50ff1ad00daf4952e3e0f6d5ef5 100644 (file)
--- 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 b37e862bf13070677bbc63226de57228fb4514dc..baf6b67d0963c3ff2c77d711e4afc8f588eff155 100644 (file)
--- 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 c61b27130a27221a44ecd5cd36ad873da5e02129..73acdae06e2424b9d48db7398aa206008483874b 100644 (file)
--- 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);
 }