Merge from mainline:

	2005-11-09  Randolph Chung <tausq@debian.org>
	* hppa-linux-nat.c (_initialize_hppa_linux_nat): Use
	hppa_linux_{store,fetch}_inferior_registers instead of
	arm_linux_{store,fetch}_inferior_registers.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 17502429809fab63374d8d1bbb5bcfcce065a654..a05c19758fd05d8c8e1cc566725b17a036c36dc1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-13  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       Merge from mainline:
+       2005-11-09  Randolph Chung <tausq@debian.org>
+       * hppa-linux-nat.c (_initialize_hppa_linux_nat): Use
+       hppa_linux_{store,fetch}_inferior_registers instead of
+       arm_linux_{store,fetch}_inferior_registers.
+
 2005-11-13  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * arm-linux-tdep.c (eabi_linux_arm_le_breakpoint)

diff --git a/gdb/hppa-linux-nat.c b/gdb/hppa-linux-nat.c
index 94a5cc88124b457239dc9551852e68f930bb4922..dfc75b8e49453dbc30a4a62be6a84dd036b2fcee 100644 (file)
--- a/gdb/hppa-linux-nat.c
+++ b/gdb/hppa-linux-nat.c
@@ -388,8 +388,8 @@ _initialize_hppa_linux_nat (void)
   t = linux_target ();
 
   /* Add our register access methods.  */
-  t->to_fetch_registers = arm_linux_fetch_inferior_registers;
-  t->to_store_registers = arm_linux_store_inferior_registers;
+  t->to_fetch_registers = hppa_linux_fetch_inferior_registers;
+  t->to_store_registers = hppa_linux_store_inferior_registers;
 
   /* Register the target.  */
   add_target (t);