Merge GDB 7.5.1

gdb/python/py-stopevent.c

 /* Python interface to inferior stop events.
 
    Copyright (C) 2009-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.
@@ skipping 24 matching lines @@
 }
 
 /* Callback observers when a stop event occurs.  This function will create a
    new Python stop event object.  If only a specific thread is stopped the
    thread object of the event will be set to that thread.  Otherwise, if all
    threads are stopped thread object will be set to None.
    return 0 if the event was created and emitted successfully otherwise
    returns -1.  */
 
 int
-emit_stop_event (struct bpstats *bs, enum target_signal stop_signal)
+emit_stop_event (struct bpstats *bs, enum gdb_signal stop_signal)
 {
   PyObject *stop_event_obj = NULL; /* Appease GCC warning.  */
   PyObject *list = NULL;
   PyObject *first_bp = NULL;
   struct bpstats *current_bs;
 
   if (evregpy_no_listeners_p (gdb_py_events.stop))
     return 0;
 
   /* Add any breakpoint set at this location to the list.  */
@@ skipping 21 matching lines @@
     }
 
   if (list != NULL)
     {
       stop_event_obj = create_breakpoint_event_object (list, first_bp);
       if (!stop_event_obj)
         goto fail;
     }
 
   /* Check if the signal is "Signal 0" or "Trace/breakpoint trap".  */
-  if (stop_signal != TARGET_SIGNAL_0
-      && stop_signal != TARGET_SIGNAL_TRAP)
+  if (stop_signal != GDB_SIGNAL_0
+      && stop_signal != GDB_SIGNAL_TRAP)
     {
       stop_event_obj =
           create_signal_event_object (stop_signal);
       if (!stop_event_obj)
         goto fail;
     }
 
   /* If all fails emit an unknown stop event.  All event types should
      be known and this should eventually be unused.  */
   if (!stop_event_obj)
     {
       stop_event_obj = create_stop_event_object (&stop_event_object_type);
       if (!stop_event_obj)
         goto fail;
     }
 
   return evpy_emit_event (stop_event_obj, gdb_py_events.stop);
 
  fail:
   Py_XDECREF (list);
   return -1;
 }
 
 GDBPY_NEW_EVENT_TYPE (stop,
                       "gdb.StopEvent",
                       "StopEvent",
                       "GDB stop event object",
                       thread_event_object_type,
                       /*no qual*/);