diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c0601fa7dcc..0bb6d75d356 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-02  Joel Brobecker  <brobecker@adacore.com>
+
+	* sol-thread.c (solaris_pid_to_str): Make static.
+	(_initialize_sol_thread): Add prototype.
+
 2012-05-02  Joel Brobecker  <brobecker@adacore.com>
 
 	* sol-thread.c (procfs_pid_to_str): Delete extern declaration.
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index bfa116270a2..01bc2e0545b 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -1132,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];
@@ -1340,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)
 {