diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bee2ebc42d7..7f8ab20d73b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-16  Paul Brook  <paul@codesourcery.com>
+
+	* doc/invoke.texi: Document ARM VFPv4 based FPUs.
+	* config/arm/arm.c (all_fpus): Add VFPv4 entries.
+
 2009-11-14  Jan Hubicka  <jh@suse.cz>
 
 	* cgraphbuild.c (compute_call_stmt_bb_frequency): Use proper ENTRY_BLOCK_PTR.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 5fb2d17b1c9..617e0d3980a 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -823,6 +823,9 @@ static const struct arm_fpu_desc all_fpus[] =
   {"vfpv3xd-fp16",	ARM_FP_MODEL_VFP, 3, VFP_REG_SINGLE, false, true},
   {"neon",		ARM_FP_MODEL_VFP, 3, VFP_REG_D32, true , false},
   {"neon-fp16",		ARM_FP_MODEL_VFP, 3, VFP_REG_D32, true , true },
+  {"vfpv4",		ARM_FP_MODEL_VFP, 4, VFP_REG_D32, false, true},
+  {"vfpv4-d16",		ARM_FP_MODEL_VFP, 4, VFP_REG_D16, false, true},
+  {"neon-vfpv4",	ARM_FP_MODEL_VFP, 4, VFP_REG_D32, true, true},
   /* Compatibility aliases.  */
   {"vfp3",		ARM_FP_MODEL_VFP, 3, VFP_REG_D32, false, false},
 };
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 9d79d3307c5..295c0fe10be 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -9795,7 +9795,8 @@ This specifies what floating point hardware (or hardware emulation) is
 available on the target.  Permissible names are: @samp{fpa}, @samp{fpe2},
 @samp{fpe3}, @samp{maverick}, @samp{vfp}, @samp{vfpv3}, @samp{vfpv3-fp16},
 @samp{vfpv3-d16}, @samp{vfpv3-d16-fp16}, @samp{vfpv3xd}, @samp{vfpv3xd-fp16},
-@samp{neon}, and @samp{neon-fp16}.
+@samp{neon}, @samp{neon-fp16}, @samp{vfpv4}, @samp{vfpv4-d16} and
+@samp{neon-vfpv4}.
 @option{-mfp} and @option{-mfpe} are synonyms for
 @option{-mfpu}=@samp{fpe}@var{number}, for compatibility with older versions
 of GCC@.