Merge GDB 7.5.1

gdb/ia64-hpux-nat.c

 /* Copyright (C) 2010, 2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ skipping 136 matching lines @@
 {
   ptid_t new_ptid;
 
   new_ptid = super_to_wait (ops, ptid, ourstatus, options);
 
   /* If this is a DLD event (hard-coded breakpoint instruction
      that was activated by the solib-ia64-hpux module), we need to
      process it, and then resume the execution as if the event did
      not happen.  */
   if (ourstatus->kind == TARGET_WAITKIND_STOPPED
-      && ourstatus->value.sig == TARGET_SIGNAL_TRAP
+      && ourstatus->value.sig == GDB_SIGNAL_TRAP
       && ia64_hpux_at_dld_breakpoint_p (new_ptid))
     {
       ia64_hpux_handle_dld_breakpoint (new_ptid);
 
-      target_resume (new_ptid, 0, TARGET_SIGNAL_0);
+      target_resume (new_ptid, 0, GDB_SIGNAL_0);
       ourstatus->kind = TARGET_WAITKIND_IGNORE;
     }
 
   return new_ptid;
 }
 
 /* Fetch the RNAT register and supply it to the REGCACHE.  */
 
 static void
 ia64_hpux_fetch_rnat_register (struct regcache *regcache)
@@ skipping 499 matching lines @@
 
   /* On this platform, the process still exists even after we received
      an exit event.  Detaching from the process isn't sufficient either,
      as it only turns the process into a zombie.  So the only solution
      we found is to kill it.  */
   ttrace (TT_PROC_EXIT, pid, 0, 0, 0, 0);
   wait (&status);
 }
 
 /* Prevent warning from -Wmissing-prototypes.  */
-void _initialize_hppa_hpux_nat (void);
+void _initialize_ia64_hpux_nat (void);
 
 void
-_initialize_hppa_hpux_nat (void)
+_initialize_ia64_hpux_nat (void)
 {
   struct target_ops *t;
 
   t = inf_ttrace_target ();
   super_to_wait = t->to_wait;
   super_xfer_partial = t->to_xfer_partial;
   super_mourn_inferior = t->to_mourn_inferior;
 
   t->to_wait = ia64_hpux_wait;
   t->to_fetch_registers = ia64_hpux_fetch_registers;
   t->to_store_registers = ia64_hpux_store_registers;
   t->to_xfer_partial = ia64_hpux_xfer_partial;
   t->to_can_use_hw_breakpoint = ia64_hpux_can_use_hw_breakpoint;
   t->to_mourn_inferior = ia64_hpux_mourn_inferior;
   t->to_attach_no_wait = 1;
 
   add_target (t);
 }