Merge GDB 7.5.1

gdb/monitor.c

 /* Remote debugging interface for boot monitors, for GDB.
 
    Copyright (C) 1990-2002, 2006-2012 Free Software Foundation, Inc.
 
    Contributed by Cygnus Support.  Written by Rob Savoye for Cygnus.
    Resurrected from the ashes by Stu Grossman.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
@@ skipping 916 matching lines @@
 
   regcache_raw_supply (regcache, regno, regbuf);
 
   return p;
 }
 
 /* Tell the remote machine to resume.  */
 
 static void
 monitor_resume (struct target_ops *ops,
-                ptid_t ptid, int step, enum target_signal sig)
+                ptid_t ptid, int step, enum gdb_signal sig)
 {
   /* Some monitors require a different command when starting a program.  */
   monitor_debug ("MON resume\n");
   if (current_monitor->flags & MO_RUN_FIRST_TIME && first_time == 1)
     {
       first_time = 0;
       monitor_printf ("run\r");
       if (current_monitor->flags & MO_NEED_REGDUMP_AFTER_CONT)
         dump_reg_flag = 1;
       return;
@@ skipping 207 matching lines @@
     }
 
   if (current_monitor->register_pattern)
     parse_register_dump (get_current_regcache (), buf, resp_len);
 #else
   monitor_debug ("Wait fetching registers after stop\n");
   monitor_dump_regs (get_current_regcache ());
 #endif
 
   status->kind = TARGET_WAITKIND_STOPPED;
-  status->value.sig = TARGET_SIGNAL_TRAP;
+  status->value.sig = GDB_SIGNAL_TRAP;
 
   discard_cleanups (old_chain);
 
   in_monitor_wait = 0;
 
   return inferior_ptid;
 }
 
 /* Fetch register REGNO, or all registers if REGNO is -1.  Returns
    errno value.  */
@@ skipping 1206 matching lines @@
 When enabled, communication between GDB and the remote monitor\n\
 is displayed."),
                             NULL,
                             NULL, /* FIXME: i18n: */
                             &setdebuglist, &showdebuglist);
 
   /* Yes, 42000 is arbitrary.  The only sense out of it, is that it
      isn't 0.  */
   monitor_ptid = ptid_build (42000, 0, 42000);
 }