diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index da2bcee6e642..88e8eb2e4c06 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-17  Andrew Stubbs  <ams@codesourcery.com>
+
+	* config/arm/arm.c (arm_option_override): Reject -mfpu=neon
+	when architecture is older than ARMv7.
+
 2014-09-16  John David Anglin  <danglin@gcc.gnu.org>
 
 	PR target/61853
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index e4a6aaac9ec8..a289052408e1 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -2845,6 +2845,9 @@ arm_option_override (void)
 
   arm_fpu_desc = &all_fpus[arm_fpu_index];
 
+  if (TARGET_NEON && !arm_arch7)
+    error ("target CPU does not support NEON");
+
   switch (arm_fpu_desc->model)
     {
     case ARM_FP_MODEL_VFP: