* hppa-hpux-tdep.c: Include "regcache.h".

	* hppa-linux-tdep.c: Likewise.
	* hppa-tdep.c: Include "gdb_stdint.h".
	(find_unwind_entry): Cast host pointer to uintptr_t before passing
	it to paddr_nz.
	* Makefile.in: Update dependencies.

5 files changed, 20 insertions, 8 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2bf889d..f335419 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,14 @@
 2007-05-13  Ulrich Weigand  <uweigand@de.ibm.com>
 
+	* hppa-hpux-tdep.c: Include "regcache.h".
+	* hppa-linux-tdep.c: Likewise.
+	* hppa-tdep.c: Include "gdb_stdint.h".
+	(find_unwind_entry): Cast host pointer to uintptr_t before passing
+	it to paddr_nz.
+	* Makefile.in: Update dependencies.
+
+2007-05-13  Ulrich Weigand  <uweigand@de.ibm.com>
+
 	* blockframe.c: Remove obsolete comments.
 	* alpha-nat.c (fetch_osf_core_registers): Update comment.
 	* arm-tdep.h (enum gdb_regnum): Remove obsolete part of comment.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 24ed913..336396d 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2065,19 +2065,19 @@ hppa-hpux-tdep.o: hppa-hpux-tdep.c $(defs_h) $(arch_utils_h) $(gdbcore_h) \
 	$(osabi_h) $(frame_h) $(frame_unwind_h) $(trad_frame_h) $(symtab_h) \
 	$(objfiles_h) $(inferior_h) $(infcall_h) $(observer_h) \
 	$(hppa_tdep_h) $(solib_som_h) $(solib_pa64_h) $(regset_h) \
-	$(exceptions_h) $(gdb_string_h)
+	$(regcache_h) $(exceptions_h) $(gdb_string_h)
 hppa-linux-nat.o: hppa-linux-nat.c $(defs_h) $(gdbcore_h) $(regcache_h) \
 	$(gdb_string_h) $(inferior_h) $(hppa_tdep_h) $(gregset_h) \
 	$(target_h) $(linux_nat_h)
 hppa-linux-tdep.o: hppa-linux-tdep.c $(defs_h) $(gdbcore_h) $(osabi_h) \
 	$(target_h) $(objfiles_h) $(solib_svr4_h) $(glibc_tdep_h) \
 	$(frame_unwind_h) $(trad_frame_h) $(dwarf2_frame_h) $(value_h) \
-	$(hppa_tdep_h) $(elf_common_h) $(regset_h)
+	$(hppa_tdep_h) $(elf_common_h) $(regset_h) $(regcache_h)
 hppa-tdep.o: hppa-tdep.c $(defs_h) $(bfd_h) $(inferior_h) $(regcache_h) \
-	$(completer_h) $(osabi_h) $(gdb_assert_h) $(arch_utils_h) \
-	$(symtab_h) $(dis_asm_h) $(trad_frame_h) $(frame_unwind_h) \
-	$(frame_base_h) $(gdbcore_h) $(gdbcmd_h) $(objfiles_h) \
-	$(hppa_tdep_h) $(gdbtypes_h)
+	$(completer_h) $(osabi_h) $(gdb_assert_h) $(gdb_stdint_h) \
+	$(arch_utils_h) $(symtab_h) $(dis_asm_h) $(trad_frame_h) \
+	$(frame_unwind_h) $(frame_base_h) $(gdbcore_h) $(gdbcmd_h) \
+	$(objfiles_h) $(hppa_tdep_h) $(gdbtypes_h)
 hpux-thread.o: hpux-thread.c $(defs_h) $(gdbthread_h) $(target_h) \
 	$(inferior_h) $(regcache_h) $(gdb_stat_h) $(gdbcore_h) \
 	$(hppa_tdep_h) $(observer_h)
diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c
index ea4319e..05f8d83 100644
--- a/gdb/hppa-hpux-tdep.c
+++ b/gdb/hppa-hpux-tdep.c
@@ -35,6 +35,7 @@
 #include "solib-som.h"
 #include "solib-pa64.h"
 #include "regset.h"
+#include "regcache.h"
 #include "exceptions.h"
 
 #include "gdb_string.h"
diff --git a/gdb/hppa-linux-tdep.c b/gdb/hppa-linux-tdep.c
index 7d720a7..0d869ab 100644
--- a/gdb/hppa-linux-tdep.c
+++ b/gdb/hppa-linux-tdep.c
@@ -31,6 +31,7 @@
 #include "dwarf2-frame.h"
 #include "value.h"
 #include "regset.h"
+#include "regcache.h"
 #include "hppa-tdep.h"
 
 #include "elf/common.h"
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 382c712..806651c 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -31,6 +31,7 @@
 #include "completer.h"
 #include "osabi.h"
 #include "gdb_assert.h"
+#include "gdb_stdint.h"
 #include "arch-utils.h"
 /* For argument passing to the inferior */
 #include "symtab.h"
@@ -502,7 +503,7 @@ find_unwind_entry (CORE_ADDR pc)
       {
 	if (hppa_debug)
 	  fprintf_unfiltered (gdb_stdlog, "0x%s (cached) }\n",
-            paddr_nz ((CORE_ADDR) ui->cache));
+            paddr_nz ((uintptr_t) ui->cache));
         return ui->cache;
       }
 
@@ -520,7 +521,7 @@ find_unwind_entry (CORE_ADDR pc)
 	    ui->cache = &ui->table[middle];
 	    if (hppa_debug)
 	      fprintf_unfiltered (gdb_stdlog, "0x%s }\n",
-                paddr_nz ((CORE_ADDR) ui->cache));
+                paddr_nz ((uintptr_t) ui->cache));
 	    return &ui->table[middle];
 	  }