diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e046b64b5c..8559185eb8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-08-10  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* nat/linux-osdata.c (commandline_from_pid): Replace xstrprintf
+	with string_printf.
+
 2018-08-10  Keith Seitz  <keiths@redhat.com>
 
 	* compile/compile-c-support.c (add_code_header, add_code_footer):
diff --git a/gdb/nat/linux-osdata.c b/gdb/nat/linux-osdata.c
index 9850cad235..7d603a6b1b 100644
--- a/gdb/nat/linux-osdata.c
+++ b/gdb/nat/linux-osdata.c
@@ -150,7 +150,7 @@ command_from_pid (char *command, int maxlen, PID_T pid)
 static char *
 commandline_from_pid (PID_T pid)
 {
-  std::string pathname = xstrprintf ("/proc/%lld/cmdline", pid);
+  std::string pathname = string_printf ("/proc/%lld/cmdline", pid);
   char *commandline = NULL;
   gdb_file_up f = gdb_fopen_cloexec (pathname, "r");