From ffe5a37e17da959d4c4e43b33f23b9548ac6fb27 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Thu, 11 Sep 2008 14:29:21 +0000 Subject: [PATCH] * auxv.c (default_auxv_parse): Use gdbarch_ptr_bit (target_gdbarch) instead of builtin_type_void_data_ptr. * target.c (default_region_ok_for_hw_watchpoint): Likewise. --- gdb/ChangeLog | 6 ++++++ gdb/auxv.c | 3 ++- gdb/target.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 391babc75ff..455ab59dcd3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2008-09-11 Ulrich Weigand + + * auxv.c (default_auxv_parse): Use gdbarch_ptr_bit (target_gdbarch) + instead of builtin_type_void_data_ptr. + * target.c (default_region_ok_for_hw_watchpoint): Likewise. + 2008-09-11 Ulrich Weigand * expprint.c (print_subexp_standard): Compare against builtin type diff --git a/gdb/auxv.c b/gdb/auxv.c index 0baec1a7bf7..afc7fdd46d3 100644 --- a/gdb/auxv.c +++ b/gdb/auxv.c @@ -82,7 +82,8 @@ int default_auxv_parse (struct target_ops *ops, gdb_byte **readptr, gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp) { - const int sizeof_auxv_field = TYPE_LENGTH (builtin_type_void_data_ptr); + const int sizeof_auxv_field = gdbarch_ptr_bit (target_gdbarch) + / TARGET_CHAR_BIT; gdb_byte *ptr = *readptr; if (endptr == ptr) diff --git a/gdb/target.c b/gdb/target.c index a7ceec4cbd4..231a6bb0e92 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -2153,7 +2153,7 @@ target_supports_non_stop () static int default_region_ok_for_hw_watchpoint (CORE_ADDR addr, int len) { - return (len <= TYPE_LENGTH (builtin_type_void_data_ptr)); + return (len <= gdbarch_ptr_bit (target_gdbarch) / TARGET_CHAR_BIT); } static int -- 2.30.2