diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6702b445b7..2f5d1ef8b7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-08-08  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* remote.c (remote_target::download_tracepoint): Change char* to
+	const char*.
+
 2018-08-07  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* target.h (target_options_to_string): Return an std::string.
diff --git a/gdb/remote.c b/gdb/remote.c
index 33f6cd57aa..3b19da75ea 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -12841,7 +12841,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
   struct tracepoint *t = (struct tracepoint *) b;
   struct remote_state *rs = get_remote_state ();
   int ret;
-  char *err_msg = _("Tracepoint packet too large for target.");
+  const char *err_msg = _("Tracepoint packet too large for target.");
   size_t size_left;
 
   /* We use a buffer other than rs->buf because we'll build strings