diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 048ac3ed13..15dbdf4d7d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-14  Yao Qi  <yao.qi@linaro.org>
+
+	* remote.c (remote_set_syscall_catchpoint): Cast to char *.
+	* thread.c (do_captured_thread_select): Cast to const char *.
+
 2016-01-14  Yao Qi  <yao.qi@linaro.org>
 
 	* arch/arm-get-next-pcs.c (arm_get_next_pcs_ctor): Change
diff --git a/gdb/remote.c b/gdb/remote.c
index 4a42da8ec2..b0303f68b8 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -2033,7 +2033,7 @@ remote_set_syscall_catchpoint (struct target_ops *self,
 	 big, fallback on the non-selective packet.  */
       const int maxpktsz = strlen ("QCatchSyscalls:1") + n_sysno * 9 + 1;
 
-      catch_packet = xmalloc (maxpktsz);
+      catch_packet = (char *) xmalloc (maxpktsz);
       strcpy (catch_packet, "QCatchSyscalls:1");
       if (!any_count)
 	{
diff --git a/gdb/thread.c b/gdb/thread.c
index cdd2a2f265..b3b3995d60 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -1996,7 +1996,7 @@ show_print_thread_events (struct ui_file *file, int from_tty,
 static int
 do_captured_thread_select (struct ui_out *uiout, void *tidstr_v)
 {
-  const char *tidstr = tidstr_v;
+  const char *tidstr = (const char *) tidstr_v;
   struct thread_info *tp;
 
   if (ui_out_is_mi_like_p (uiout))