* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 391babc75ff1cf16e73e6a0aa327e24b2cacfcfb..455ab59dcd3e3203699e197dd4ee76440246891b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-11  Ulrich Weigand  <[email protected]>
+
+       * 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  <[email protected]>
 
        * expprint.c (print_subexp_standard): Compare against builtin type

diff --git a/gdb/auxv.c b/gdb/auxv.c
index 0baec1a7bf77a67d4e2b4354ceee534679fd9e83..afc7fdd46d3c1b7c36dcf76050a9b9c0a163d8b6 100644 (file)
--- 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 a7ceec4cbd4f3fa97dbffee9467bc412fdb94537..231a6bb0e929d2108336e1c780b50b3b5dfc796b 100644 (file)
--- 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