diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b6748327fe..70cd4b0b87 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-05  Yao Qi  <yao.qi@linaro.org>
+
+	* linux-arm-low.c (arm_sigreturn_next_pc): Change type of cpsr
+	to uint32_t.
+
 2016-05-04  Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
 
 	* spu-low.c (fetch_ppc_register): Cast PowerPC-Linux-specific value
diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
index 57826f17d7..952ec26108 100644
--- a/gdb/gdbserver/linux-arm-low.c
+++ b/gdb/gdbserver/linux-arm-low.c
@@ -763,7 +763,7 @@ arm_sigreturn_next_pc (struct regcache *regcache, int svc_number,
   /* Offset of PC register.  */
   int pc_offset = 0;
   CORE_ADDR next_pc = 0;
-  CORE_ADDR cpsr;
+  uint32_t cpsr;
 
   gdb_assert (svc_number == __NR_sigreturn || svc_number == __NR_rt_sigreturn);