From 4fe99ffbcc277eb81e708a29fe199c383c399a8d Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Wed, 13 Jun 2007 17:48:13 +0000 Subject: [PATCH] 2007-06-13 Markus Deuling * gdbarch.sh (TARGET_BFD_VMA_BIT): Replace by gdbarch_bfd_vma_bit. * gdbtypes.c (build_flt): Likewise. * gdbarch.c, gdbarch.h: Regenerate. --- gdb/ChangeLog | 6 ++++++ gdb/gdbarch.c | 5 ----- gdb/gdbarch.h | 6 ------ gdb/gdbarch.sh | 2 +- gdb/gdbtypes.c | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2b3881d..818f772 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2007-06-13 Markus Deuling + * gdbarch.sh (TARGET_BFD_VMA_BIT): Replace by gdbarch_bfd_vma_bit. + * gdbtypes.c (build_flt): Likewise. + * gdbarch.c, gdbarch.h: Regenerate. + +2007-06-13 Markus Deuling + * gdbarch.sh (BREAKPOINT_FROM_PC): Replace by gdbarch_breakpoint_from_pc. * s390-tdep.c (s390_gdbarch_init): Likewise (comment). diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index e14b8e4..c1b705e 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -704,11 +704,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: bfd_arch_info = %s\n", TARGET_ARCHITECTURE->printable_name); -#ifdef TARGET_BFD_VMA_BIT - fprintf_unfiltered (file, - "gdbarch_dump: TARGET_BFD_VMA_BIT # %s\n", - XSTRING (TARGET_BFD_VMA_BIT)); -#endif fprintf_unfiltered (file, "gdbarch_dump: bfd_vma_bit = %s\n", paddr_d (current_gdbarch->bfd_vma_bit)); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index c99b15b..e5fcc7b 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -157,12 +157,6 @@ extern void set_gdbarch_addr_bit (struct gdbarch *gdbarch, int addr_bit); extern int gdbarch_bfd_vma_bit (struct gdbarch *gdbarch); extern void set_gdbarch_bfd_vma_bit (struct gdbarch *gdbarch, int bfd_vma_bit); -#if !defined (GDB_TM_FILE) && defined (TARGET_BFD_VMA_BIT) -#error "Non multi-arch definition of TARGET_BFD_VMA_BIT" -#endif -#if !defined (TARGET_BFD_VMA_BIT) -#define TARGET_BFD_VMA_BIT (gdbarch_bfd_vma_bit (current_gdbarch)) -#endif /* One if `char' acts like `signed char', zero if `unsigned char'. */ diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 4ccaf79..58d7d2e 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -415,7 +415,7 @@ v::int:ptr_bit:::8 * sizeof (void*):current_gdbarch->int_bit::0 # addr_bit is the size of a target address as represented in gdb v:TARGET_ADDR_BIT:int:addr_bit:::8 * sizeof (void*):0:gdbarch_ptr_bit (current_gdbarch): # Number of bits in a BFD_VMA for the target object file format. -v:TARGET_BFD_VMA_BIT:int:bfd_vma_bit:::8 * sizeof (void*):TARGET_ARCHITECTURE->bits_per_address::0 +v::int:bfd_vma_bit:::8 * sizeof (void*):TARGET_ARCHITECTURE->bits_per_address::0 # # One if \`char' acts like \`signed char', zero if \`unsigned char'. v::int:char_signed:::1:-1:1 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 9c093ad..93c1e55 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -3578,7 +3578,7 @@ Show resolution of opaque struct/class/union types (if set before loading symbol TYPE_FLAG_UNSIGNED, "__CORE_ADDR", (struct objfile *) NULL); builtin_type_bfd_vma = - init_type (TYPE_CODE_INT, TARGET_BFD_VMA_BIT / 8, + init_type (TYPE_CODE_INT, gdbarch_addr_bit (current_gdbarch) / 8, TYPE_FLAG_UNSIGNED, "__bfd_vma", (struct objfile *) NULL); } -- 2.7.4