aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/opts.c12
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/funroll-loops-all.c4
4 files changed, 21 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2528870..73e6ad9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-28 Matt Kraai <kraai@alumni.cmu.edu>
+
+ PR diagnostic/17594
+ * opts.c (find_opt): Require that the input match a switch exactly
+ or that the switch take a joined option to be interpreted as a
+ match for another language.
+
2004-11-28 Andrew Pinski <pinskia@physics.uc.edu>
* timevar.def (TV_TREE_REDPHI): New timevar.
diff --git a/gcc/opts.c b/gcc/opts.c
index 188ad29..e930c44 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -176,13 +176,13 @@ find_opt (const char *input, int lang_mask)
{
const struct cl_option *opt = &cl_options[mn];
- /* Is this switch a prefix of the input? */
- if (!strncmp (input, opt->opt_text + 1, opt->opt_len))
+ /* Is the input either an exact match or a prefix that takes a
+ joined argument? */
+ if (!strncmp (input, opt->opt_text + 1, opt->opt_len)
+ && (input[opt->opt_len] == '\0' || (opt->flags & CL_JOINED)))
{
- /* If language is OK, and the match is exact or the switch
- takes a joined argument, return it. */
- if ((opt->flags & lang_mask)
- && (input[opt->opt_len] == '\0' || (opt->flags & CL_JOINED)))
+ /* If language is OK, return it. */
+ if (opt->flags & lang_mask)
return mn;
/* If we haven't remembered a prior match, remember this
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8e56d03..94174d9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-28 Matt Kraai <kraai@alumni.cmu.edu>
+
+ * gcc.dg/funroll-loops-all.c: New.
+
2004-11-28 Hans-Peter Nilsson <hp@bitrange.com>
PR target/18489
diff --git a/gcc/testsuite/gcc.dg/funroll-loops-all.c b/gcc/testsuite/gcc.dg/funroll-loops-all.c
new file mode 100644
index 0000000..c627675
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/funroll-loops-all.c
@@ -0,0 +1,4 @@
+/* PR 17594 */
+/* { dg-do compile } */
+/* { dg-options "-funroll-loops-all" } */
+/* { dg-error "unrecognized command line option \"-funroll-loops-all\"" "" { target *-*-* } 0 } */