aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Earnshaw <rearnsha@arm.com>2010-02-06 14:05:27 +0000
committerRichard Earnshaw <rearnsha@gcc.gnu.org>2010-02-06 14:05:27 +0000
commitb761dbe6a1213b8b212ffda15b95c59f3f12147f (patch)
tree364b270e2eb5a876ba74baaa904957b7a21ed946 /gcc
parente984a04ecc611ce60e4ba78f6455d6822349b5cf (diff)
downloadgcc-b761dbe6a1213b8b212ffda15b95c59f3f12147f.zip
gcc-b761dbe6a1213b8b212ffda15b95c59f3f12147f.tar.gz
gcc-b761dbe6a1213b8b212ffda15b95c59f3f12147f.tar.bz2
re PR target/42957 (ARM: Segfault when invalid -mfpu argument is specified.)
PR target/42957 * arm.c (arm_override_options): Just return if the user has specified an invalid fpu name. From-SVN: r156539
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/arm/arm.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c970912..d1b5fd3 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 543498e..466981a 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)
{