re PR middle-end/37805 (gcc --help=separate)

[gcc.git] / gcc / opts.c

diff --git a/gcc/opts.c b/gcc/opts.c
index cccb80b403fed8a82732386c853c826b98f45622..631977097ec099838d410003d219f574dcedd702 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1,5 +1,5 @@
 /* Command line option handling.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
    Contributed by Neil Booth.
 
@@ -811,6 +811,7 @@ decode_options (unsigned int argc, const char **argv)
   static int initial_avg_aliased_vops;
   static int initial_min_crossjump_insns;
   static int initial_max_fields_for_field_sensitive;
+  static int initial_loop_invariant_max_bbs_in_loop;
   static unsigned int initial_lang_mask;
 
   unsigned int i, lang_mask;
@@ -833,6 +834,8 @@ decode_options (unsigned int argc, const char **argv)
        = compiler_params[PARAM_MIN_CROSSJUMP_INSNS].value;
       initial_max_fields_for_field_sensitive
        = compiler_params[PARAM_MAX_FIELDS_FOR_FIELD_SENSITIVE].value;
+      initial_loop_invariant_max_bbs_in_loop
+       = compiler_params[PARAM_LOOP_INVARIANT_MAX_BBS_IN_LOOP].value;
     }
   else
     lang_mask = initial_lang_mask;
@@ -943,6 +946,10 @@ decode_options (unsigned int argc, const char **argv)
   set_param_value ("max-fields-for-field-sensitive",
                   (opt2) ? 100 : initial_max_fields_for_field_sensitive);
 
+  /* For -O1 only do loop invariant motion for very small loops.  */
+  set_param_value ("loop-invariant-max-bbs-in-loop",
+                  (opt2) ? initial_loop_invariant_max_bbs_in_loop : 1000);
+
   /* -O3 optimizations.  */
   opt3 = (optimize >= 3);
   flag_predictive_commoning = opt3;
@@ -1389,7 +1396,7 @@ print_specific_help (unsigned int include_flags,
        default:
          if (i >= cl_lang_count)
            break;
-         if ((exclude_flags & ((1U << cl_lang_count) - 1)) != 0)
+         if (exclude_flags & all_langs_mask)
            description = _("The following options are specific to just the language ");
          else
            description = _("The following options are supported by the language ");
@@ -1402,8 +1409,12 @@ print_specific_help (unsigned int include_flags,
     {
       if (any_flags == 0)
        {
-         if (include_flags == CL_UNDOCUMENTED)
+         if (include_flags & CL_UNDOCUMENTED)
            description = _("The following options are not documented");
+         else if (include_flags & CL_SEPARATE)
+           description = _("The following options take separate arguments");
+         else if (include_flags & CL_JOINED)
+           description = _("The following options take joined arguments");
          else
            {
              internal_error ("unrecognized include_flags 0x%x passed to print_specific_help",
@@ -1508,6 +1519,8 @@ common_handle_option (size_t scode, const char *arg, int value,
              { "warnings", CL_WARNING },
              { "undocumented", CL_UNDOCUMENTED },
              { "params", CL_PARAMS },
+             { "joined", CL_JOINED },
+             { "separate", CL_SEPARATE },
              { "common", CL_COMMON },
              { NULL, 0 }
            };
@@ -1530,6 +1543,11 @@ common_handle_option (size_t scode, const char *arg, int value,
              len = strlen (a);
            else
              len = comma - a;
+           if (len == 0)
+             {
+               a = comma + 1;
+               continue;
+             }
 
            /* Check to see if the string matches an option class name.  */
            for (i = 0, specific_flag = 0; specifics[i].string != NULL; i++)
@@ -1538,7 +1556,7 @@ common_handle_option (size_t scode, const char *arg, int value,
                  specific_flag = specifics[i].flag;
                  break;
                }
-           
+
            /* Check to see if the string matches a language name.
               Note - we rely upon the alpha-sorted nature of the entries in
               the lang_names array, specifically that shorter names appear