diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c9709125689..d1b5fd3ae87 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-06  Richard Earnshaw  <rearnsha@arm.com>
+
+	PR target/42957
+	* arm.c (arm_override_options): Just return if the user has specified
+	an invalid fpu name.
+
 2010-02-03  Jason Merrill  <jason@redhat.com>
 
 	PR c++/42870
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 543498ea82a..466981a7e7b 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -1639,8 +1639,12 @@ arm_override_options (void)
 	  break;
 	}
     }
+
   if (!arm_fpu_desc)
-    error ("invalid floating point option: -mfpu=%s", target_fpu_name);
+    {
+      error ("invalid floating point option: -mfpu=%s", target_fpu_name);
+      return;
+    }
 
   switch (arm_fpu_desc->model)
     {