diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6c18be9a747..be1b3d8c7ef 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-08  Joel Brobecker  <brobecker@adacore.com>
+
+	* aarch64-tdep.c (aapcs_is_vfp_call_or_return_candidate_1):
+	return the correct count for potential HFAs.
+
 2018-11-08  Jan Beulich  <jbeulich@suse.com>
 
 	* i387-tdep.c (i387_supply_xsave): Split handling of
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 0211930d7f0..51f1632eea7 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -1212,7 +1212,7 @@ aapcs_is_vfp_call_or_return_candidate_1 (struct type *type,
 	    if (count == -1)
 	      return count;
 
-	    count *= TYPE_LENGTH (type);
+	    count *= (TYPE_LENGTH (type) / TYPE_LENGTH (target_type));
 	      return count;
 	  }
       }