Index: ChangeLog
2004-04-06  Andrew Cagney  <cagney@redhat.com>

	* hppa-tdep.c (hppa_breakpoint_from_pc): Make static.
	(hppa_gdbarch_init): Set gdbarch_breakpoint_from_pc
	* config/pa/tm-hppa.h (BREAKPOINT_FROM_PC, BREAKPOINT32): 
	(hppa_breakpoint_from_pc): Delete.

Index: hppa-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/hppa-tdep.c,v
retrieving revision 1.141
diff -u -r1.141 hppa-tdep.c
--- hppa-tdep.c	6 Apr 2004 15:41:50 -0000	1.141
+++ hppa-tdep.c	6 Apr 2004 16:07:10 -0000
@@ -658,7 +658,7 @@
   return NULL;
 }
 
-const unsigned char *
+static const unsigned char *
 hppa_breakpoint_from_pc (CORE_ADDR *pc, int *len)
 {
   static const unsigned char breakpoint[] = {0x00, 0x01, 0x00, 0x04};
@@ -2726,7 +2726,9 @@
     default:
       internal_error (__FILE__, __LINE__, "bad switch");
     }
-      
+
+  set_gdbarch_breakpoint_from_pc (gdbarch, hppa_breakpoint_from_pc);
+
   /* Frame unwind methods.  */
   set_gdbarch_unwind_dummy_id (gdbarch, hppa_unwind_dummy_id);
   set_gdbarch_unwind_pc (gdbarch, hppa_unwind_pc);
Index: config/pa/tm-hppa.h
===================================================================
RCS file: /cvs/src/src/gdb/config/pa/tm-hppa.h,v
retrieving revision 1.68
diff -u -r1.68 tm-hppa.h
--- config/pa/tm-hppa.h	3 Apr 2004 17:49:07 -0000	1.68
+++ config/pa/tm-hppa.h	6 Apr 2004 16:07:11 -0000
@@ -39,12 +39,6 @@
 struct type;
 struct inferior_status;
 
-/* Sequence of bytes for breakpoint instruction.  */
-
-const unsigned char *hppa_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr);
-#define BREAKPOINT_FROM_PC(PCPTR,LENPTR) hppa_breakpoint_from_pc ((PCPTR), (LENPTR))
-#define BREAKPOINT32 0x10004
-
 extern int hppa_pc_requires_run_before_use (CORE_ADDR pc);
 #define PC_REQUIRES_RUN_BEFORE_USE(pc) hppa_pc_requires_run_before_use (pc)