diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 30ae510a63..fd2ac45cac 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-16  Yao Qi  <yao.qi@linaro.org>
+
+	* aarch64-tdep.c (aarch64_extract_return_value):  Change array
+	buf's length to V_REGISTER_SIZE.
+
 2015-11-16  Yao Qi  <yao.qi@linaro.org>
 
 	* aarch64-tdep.c (pass_in_x_or_stack): Change argument type
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index b025ebaf72..de045e604b 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -1620,7 +1620,7 @@ aarch64_extract_return_value (struct type *type, struct regcache *regs,
       for (i = 0; i < elements; i++)
 	{
 	  int regno = AARCH64_V0_REGNUM + i;
-	  bfd_byte buf[X_REGISTER_SIZE];
+	  bfd_byte buf[V_REGISTER_SIZE];
 
 	  if (aarch64_debug)
 	    {