diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 07cb80d4d34..da461ecb5d8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-15  Steve Ellcey  <sellcey@mips.com>
+
+	* remote-sim.c (sim_command_completer): Make char arguments const.
+
 2013-03-15  Tom Tromey  <tromey@redhat.com>
 
 	PR c++/15116:
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 860eaf33adf..a578bbc0740 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -1196,7 +1196,8 @@ simulator_command (char *args, int from_tty)
 }
 
 static VEC (char_ptr) *
-sim_command_completer (struct cmd_list_element *ignore, char *text, char *word)
+sim_command_completer (struct cmd_list_element *ignore, const char *text,
+		       const char *word)
 {
   struct sim_inferior_data *sim_data;
   char **tmp;
diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog
index d9618014a10..142f87ae306 100644
--- a/include/gdb/ChangeLog
+++ b/include/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-15  Steve Ellcey  <sellcey@mips.com>
+
+	* gdb/remote-sim.h (sim_command_completer): Make char arguments const.
+
 2013-01-01  Joel Brobecker  <brobecker@adacore.com>
 
 	Update year range in copyright notice of all files.
diff --git a/include/gdb/remote-sim.h b/include/gdb/remote-sim.h
index 43c22ebc3bb..113030c8215 100644
--- a/include/gdb/remote-sim.h
+++ b/include/gdb/remote-sim.h
@@ -278,7 +278,7 @@ void sim_do_command (SIM_DESC sd, char *cmd);
 /* Complete a command based on the available sim commands.  Returns an
    array of possible matches.  */
 
-char **sim_complete_command (SIM_DESC sd, char *text, char *word);
+char **sim_complete_command (SIM_DESC sd, const char *text, const char *word);
 
 #ifdef __cplusplus
 }
diff --git a/sim/ChangeLog b/sim/ChangeLog
index 84d8d02b806..bc3c89412e1 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,17 @@
+2013-03-15  Steve Ellcey  <sellcey@mips.com>
+
+	* arm/wrapper.c (sim_complete_command): Make char arguments const.
+	* avr/interp.c (sim_complete_command): Ditto.
+	* common/sim-options.c (sim_complete_command): Ditto.
+	* cr16/interp.c (sim_complete_command): Ditto.
+	* erc32/interf.c (sim_complete_command): Ditto.
+	* m32c/gdb-if.c (sim_complete_command): Ditto.
+	* microblaze/interp.c (sim_complete_command): Ditto.
+	* ppc/sim_calls.c (sim_complete_command): Ditto.
+	* rl78/gdb-if.c (sim_complete_command): Ditto.
+	* rx/gdb-if.c (sim_complete_command): Ditto.
+	* sh/interp.c (sim_complete_command): Ditto.
+
 2013-01-01  Joel Brobecker  <brobecker@adacore.com>
 
 	Update year range in copyright notice of all files.
diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index 7f794a3440e..a4b76835a50 100644
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -945,7 +945,7 @@ sim_set_callbacks (ptr)
 }
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
   return NULL;
 }
diff --git a/sim/avr/interp.c b/sim/avr/interp.c
index a5212e79a7c..23fc8dcbd5b 100644
--- a/sim/avr/interp.c
+++ b/sim/avr/interp.c
@@ -1855,7 +1855,7 @@ sim_set_callbacks (host_callback *ptr)
 }
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
   return NULL;
 }
diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c
index 73f84fb3dec..fdc05a4a0e3 100644
--- a/sim/common/sim-options.c
+++ b/sim/common/sim-options.c
@@ -950,7 +950,7 @@ complete_option_list (char **ret, size_t *cnt, const struct option_list *ol,
    completed is stored in @word.  Trailing text of @word is not.  */
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
   char **ret = NULL;
   size_t cnt = 1;
diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c
index 2caffc24b2c..3af58f64176 100644
--- a/sim/cr16/interp.c
+++ b/sim/cr16/interp.c
@@ -1553,7 +1553,7 @@ sim_store_register (sd, rn, memory, length)
 }
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
   return NULL;
 }
diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c
index 1ec02befdd7..e2db44ea7fb 100644
--- a/sim/erc32/interf.c
+++ b/sim/erc32/interf.c
@@ -485,7 +485,7 @@ sim_do_command(sd, cmd)
 }
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
   return NULL;
 }
diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c
index d02d24ec449..83e9f1e9560 100644
--- a/sim/m32c/gdb-if.c
+++ b/sim/m32c/gdb-if.c
@@ -704,7 +704,7 @@ sim_do_command (SIM_DESC sd, char *cmd)
 }
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
   return NULL;
 }
diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c
index d09327dbfe4..72a45936123 100644
--- a/sim/microblaze/interp.c
+++ b/sim/microblaze/interp.c
@@ -1090,7 +1090,7 @@ sim_set_callbacks (host_callback *ptr)
 }
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
   return NULL;
 }
diff --git a/sim/ppc/sim_calls.c b/sim/ppc/sim_calls.c
index a4ceb3fbe19..a3ebba0f5b3 100644
--- a/sim/ppc/sim_calls.c
+++ b/sim/ppc/sim_calls.c
@@ -259,7 +259,7 @@ sim_do_command (SIM_DESC sd, char *cmd)
 }
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
   return NULL;
 }
diff --git a/sim/rl78/gdb-if.c b/sim/rl78/gdb-if.c
index 0c131a19973..04d4f0e1107 100644
--- a/sim/rl78/gdb-if.c
+++ b/sim/rl78/gdb-if.c
@@ -567,7 +567,7 @@ sim_do_command (SIM_DESC sd, char *cmd)
 /* Stub for command completion.  */
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
     return NULL;
 }
diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c
index 248fdcacf82..2e41b0917a6 100644
--- a/sim/rx/gdb-if.c
+++ b/sim/rx/gdb-if.c
@@ -864,7 +864,7 @@ sim_do_command (SIM_DESC sd, char *cmd)
 }
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
   return NULL;
 }
diff --git a/sim/sh/interp.c b/sim/sh/interp.c
index e9313c76cbd..4b2ca7e5a99 100644
--- a/sim/sh/interp.c
+++ b/sim/sh/interp.c
@@ -2789,7 +2789,7 @@ sim_set_callbacks (p)
 }
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
   return NULL;
 }