diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog
index dabaa5b19e..9ce3db9141 100644
--- a/include/gdb/ChangeLog
+++ b/include/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* callback.h (cb_get_string): New prototype.
+
 2011-04-14  Mike Frysinger  <vapier@gentoo.org>
 
 	* remote-sim.h (sim_complete_command): New prototype.
diff --git a/include/gdb/callback.h b/include/gdb/callback.h
index a1f79f94de..bbc5bb3481 100644
--- a/include/gdb/callback.h
+++ b/include/gdb/callback.h
@@ -324,6 +324,9 @@ int cb_is_stdin (host_callback *, int);
 int cb_is_stdout (host_callback *, int);
 int cb_is_stderr (host_callback *, int);
 
+/* Read a string out of the target.  */
+int cb_get_string (host_callback *, CB_SYSCALL *, char *, int, unsigned long);
+
 /* Perform a system call.  */
 CB_RC cb_syscall (host_callback *, CB_SYSCALL *);
 
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 405888fdd3..c69b94864b 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* syscall.c (cb_get_string): Rename from "get_string".
+	(get_path): Rename get_string call to cb_get_string.
+
 2011-12-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* Make-common.in (VPATH): Add $(srccom).
diff --git a/sim/common/syscall.c b/sim/common/syscall.c
index 28816c02b5..1dfe7aabaa 100644
--- a/sim/common/syscall.c
+++ b/sim/common/syscall.c
@@ -76,8 +76,8 @@ char *simulator_sysroot = "";
 /* Utility of cb_syscall to fetch a path name or other string from the target.
    The result is 0 for success or a host errno value.  */
 
-static int
-get_string (cb, sc, buf, buflen, addr)
+int
+cb_get_string (cb, sc, buf, buflen, addr)
      host_callback *cb;
      CB_SYSCALL *sc;
      char *buf;
@@ -121,7 +121,7 @@ get_path (cb, sc, addr, bufp)
   int result;
   int sysroot_len = strlen (simulator_sysroot);
 
-  result = get_string (cb, sc, buf, MAX_PATH_LEN - sysroot_len, addr);
+  result = cb_get_string (cb, sc, buf, MAX_PATH_LEN - sysroot_len, addr);
   if (result == 0)
     {
       /* Prepend absolute paths with simulator_sysroot.  Relative paths