Merge GDB 7.5.1

gdb/python/py-stopevent.c

Index: gdb/python/py-stopevent.c
diff --git a/gdb/python/py-stopevent.c b/gdb/python/py-stopevent.c
index 1df4ae9e1d31c2329d39b96b4b5bf5f20487638a..7e0094848dd51fafb7c1cd63a1f854e456bc4c1e 100644
--- a/gdb/python/py-stopevent.c
+++ b/gdb/python/py-stopevent.c
@@ -42,7 +42,7 @@ create_stop_event_object (PyTypeObject *py_type)
    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;
@@ -84,8 +84,8 @@ emit_stop_event (struct bpstats *bs, enum target_signal stop_signal)
     }
 
   /* 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);