MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gdbarch.h: Change gdbarch_info::tdep_info's type to void *

Browse Source 
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.
This commit is contained in:
Simon Marchi 2015-09-30 11:21:52 -04:00
parent 7781c06f6e
commit ede5f15146
8 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -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> 2015-09-30 Kevin Buettner <kevinb@redhat.com>
* infcmd.c (finish_command_fsm_should_stop): Don't attempt to * infcmd.c (finish_command_fsm_should_stop): Don't attempt to

2
gdb/gdbarch.h
View File

@ -1561,7 +1561,7 @@ struct gdbarch_info
bfd *abfd; bfd *abfd;
/* Use default: NULL (ZERO). */ /* Use default: NULL (ZERO). */
struct gdbarch_tdep_info *tdep_info; void *tdep_info;
/* Use default: GDB_OSABI_UNINITIALIZED (-1). */ /* Use default: GDB_OSABI_UNINITIALIZED (-1). */
enum gdb_osabi osabi; enum gdb_osabi osabi;

2
gdb/gdbarch.sh
View File

@ -1429,7 +1429,7 @@ struct gdbarch_info
bfd *abfd; bfd *abfd;
/* Use default: NULL (ZERO). */ /* Use default: NULL (ZERO). */
struct gdbarch_tdep_info *tdep_info; void *tdep_info;
/* Use default: GDB_OSABI_UNINITIALIZED (-1). */ /* Use default: GDB_OSABI_UNINITIALIZED (-1). */
enum gdb_osabi osabi; enum gdb_osabi osabi;

2
gdb/i386-tdep.c
View File

@ -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); set_gdbarch_insn_is_jump (gdbarch, i386_insn_is_jump);
/* Hook in ABI-specific overrides, if they have been registered. */ /* 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); gdbarch_init_osabi (info, gdbarch);
if (!i386_validate_tdesc_p (tdep, tdesc_data)) if (!i386_validate_tdesc_p (tdep, tdesc_data))

2
gdb/mips-tdep.c
View File

@ -8898,7 +8898,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
mips_register_g_packet_guesses (gdbarch); mips_register_g_packet_guesses (gdbarch);
/* Hook in OS ABI-specific overrides, if they have been registered. */ /* 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); gdbarch_init_osabi (info, gdbarch);
/* The hook may have adjusted num_regs, fetch the final value and /* The hook may have adjusted num_regs, fetch the final value and

2
gdb/ppc-linux-tdep.c
View File

@ -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.bfd_arch_info = bfd_lookup_arch (bfd_arch_spu, bfd_mach_spu);
info.byte_order = BFD_ENDIAN_BIG; info.byte_order = BFD_ENDIAN_BIG;
info.osabi = GDB_OSABI_LINUX; 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); data.gdbarch = gdbarch_find_by_info (info);
if (!data.gdbarch) if (!data.gdbarch)
return 0; return 0;

2
gdb/rs6000-tdep.c
View File

@ -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. */ /* Hook in ABI-specific overrides, if they have been registered. */
info.target_desc = tdesc; info.target_desc = tdesc;
info.tdep_info = (struct gdbarch_tdep_info *) tdesc_data; info.tdep_info = tdesc_data;
gdbarch_init_osabi (info, gdbarch); gdbarch_init_osabi (info, gdbarch);
switch (info.osabi) switch (info.osabi)

2
gdb/spu-multiarch.c
View File

@ -107,7 +107,7 @@ spu_gdbarch (int spufs_fd)
info.bfd_arch_info = bfd_lookup_arch (bfd_arch_spu, bfd_mach_spu); info.bfd_arch_info = bfd_lookup_arch (bfd_arch_spu, bfd_mach_spu);
info.byte_order = BFD_ENDIAN_BIG; info.byte_order = BFD_ENDIAN_BIG;
info.osabi = GDB_OSABI_LINUX; 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); return gdbarch_find_by_info (info);
} }