Merge GDB 7.5.1

gdb/sol-thread.c

Index: gdb/sol-thread.c
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index 3e5d9db2306341c70d2f080dcab75c68a3d6e2c4..3577b5affd0fa833fdb634221fbdb6039fe17011 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -69,8 +69,6 @@
 
 struct target_ops sol_thread_ops;
 
-extern char *procfs_pid_to_str (struct target_ops *ops, ptid_t ptid);
-
 /* Prototypes for supply_gregset etc.  */
 #include "gregset.h"
 
@@ -347,7 +345,7 @@ sol_thread_detach (struct target_ops *ops, char *args, int from_tty)
 
 static void
 sol_thread_resume (struct target_ops *ops,
-		   ptid_t ptid, int step, enum target_signal signo)
+		   ptid_t ptid, int step, enum gdb_signal signo)
 {
   struct cleanup *old_chain;
   struct target_ops *beneath = find_target_beneath (ops);
@@ -1134,7 +1132,7 @@ ps_lgetLDT (gdb_ps_prochandle_t ph, lwpid_t lwpid,
 
 /* Convert PTID to printable form.  */
 
-char *
+static char *
 solaris_pid_to_str (struct target_ops *ops, ptid_t ptid)
 {
   static char buf[100];
@@ -1342,6 +1340,9 @@ init_sol_thread_ops (void)
   sol_thread_ops.to_magic = OPS_MAGIC;
 }
 
+/* Silence -Wmissing-prototypes.  */
+extern void _initialize_sol_thread (void);
+
 void
 _initialize_sol_thread (void)
 {