Merge GDB 7.5.1

include/gdb/callback.h

Index: include/gdb/callback.h
diff --git a/include/gdb/callback.h b/include/gdb/callback.h
index 9b6cf8539dc05af73281dfab35a5cf44a085f140..d8d14727d31e3c55cc2f5d32537b22638b8c47c5 100644
--- a/include/gdb/callback.h
+++ b/include/gdb/callback.h
@@ -231,6 +231,11 @@ extern host_callback default_callback;
 #define CB_SYS_truncate	21
 #define CB_SYS_ftruncate 22
 #define CB_SYS_pipe 	23
+
+/* New ARGV support.  */
+#define CB_SYS_argc	24
+#define CB_SYS_argnlen	25
+#define CB_SYS_argn	26
 
 /* Struct use to pass and return information necessary to perform a
    system call.  */
@@ -309,7 +314,7 @@ int cb_target_to_host_open (host_callback *, int);
 int cb_target_to_host_signal (host_callback *, int);
 
 /* Translate host signal number to target.  */
-int cb_host_to_target_signal (host_callback *, int);
+int cb_host_to_gdb_signal (host_callback *, int);
 
 /* Translate host stat struct to target.
    If stat struct ptr is NULL, just compute target stat struct size.