PR bootstrap/43964

[pf3gnuchains/gcc-fork.git] / gcc / opts.c

diff --git a/gcc/opts.c b/gcc/opts.c
index 329f732..507b502 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -372,11 +372,13 @@ const char **in_fnames;
 unsigned num_in_fnames;
 
 static int common_handle_option (size_t scode, const char *arg, int value,
-                                unsigned int lang_mask, int kind);
+                                unsigned int lang_mask);
 static void handle_param (const char *);
+static unsigned int handle_option (const char **argv, unsigned int lang_mask);
 static char *write_langs (unsigned int lang_mask);
 static void complain_wrong_lang (const char *, const struct cl_option *,
                                 unsigned int lang_mask);
+static void handle_options (unsigned int, const char **, unsigned int);
 static void set_debug_level (enum debug_info_type type, int extended,
                             const char *arg);
 
@@ -483,57 +485,10 @@ void print_ignored_options (void)
   input_location = saved_loc;
 }
 
-
-/* Handle option OPT_INDEX, and argument ARG, for the language
-   indicated by LANG_MASK.  VALUE is true, unless no- form of an -f or
-   -W option was given.  KIND is the diagnostic_t if this is a
-   diagnostics option, DK_UNSPECIFIED otherwise.  Returns false if the
-   switch was invalid.  */
-bool
-handle_option (int opt_index, int value, const char *arg,
-               unsigned int lang_mask, int kind)
-{
-  const struct cl_option *option = &cl_options[opt_index];
-
-  if (option->flag_var)
-    set_option (opt_index, value, arg, kind);
-  
-  if (option->flags & lang_mask)
-    {
-      if (lang_hooks.handle_option (opt_index, arg, value, kind) == 0)
-       return false;
-#ifdef ENABLE_LTO
-      else
-       lto_register_user_option (opt_index, arg, value, lang_mask);
- #endif
-    }
-
-  if (option->flags & CL_COMMON)
-    {
-      if (common_handle_option (opt_index, arg, value, lang_mask, kind) == 0)
-       return false;
-#ifdef ENABLE_LTO
-      else
-       lto_register_user_option (opt_index, arg, value, CL_COMMON);
-#endif
-    }
-
-  if (option->flags & CL_TARGET)
-    {
-      if (!targetm.handle_option (opt_index, arg, value))
-       return false;
-#ifdef ENABLE_LTO
-      else
-       lto_register_user_option (opt_index, arg, value, CL_TARGET);
-#endif
-    }
-  return true;
-}
-
 /* Handle the switch beginning at ARGV for the language indicated by
    LANG_MASK.  Returns the number of switches consumed.  */
 static unsigned int
-read_cmdline_option (const char **argv, unsigned int lang_mask)
+handle_option (const char **argv, unsigned int lang_mask)
 {
   size_t opt_index;
   const char *opt, *arg = 0;
@@ -654,8 +609,32 @@ read_cmdline_option (const char **argv, unsigned int lang_mask)
        }
     }
 
-  if (!handle_option (opt_index, value, arg, lang_mask, DK_UNSPECIFIED))
-    result = 0;
+  if (option->flag_var)
+    set_option (option, value, arg);
+
+  if (option->flags & lang_mask)
+    {
+      if (lang_hooks.handle_option (opt_index, arg, value) == 0)
+       result = 0;
+      else
+       lto_register_user_option (opt_index, arg, value, lang_mask);
+    }
+
+  if (result && (option->flags & CL_COMMON))
+    {
+      if (common_handle_option (opt_index, arg, value, lang_mask) == 0)
+       result = 0;
+      else
+       lto_register_user_option (opt_index, arg, value, CL_COMMON);
+    }
+
+  if (result && (option->flags & CL_TARGET))
+    {
+      if (!targetm.handle_option (opt_index, arg, value))
+       result = 0;
+      else
+       lto_register_user_option (opt_index, arg, value, CL_TARGET);
+    }
 
  done:
   if (dup)
@@ -756,7 +735,7 @@ flag_instrument_functions_exclude_p (tree fndecl)
    contains has a single bit set representing the current
    language.  */
 static void
-read_cmdline_options (unsigned int argc, const char **argv, unsigned int lang_mask)
+handle_options (unsigned int argc, const char **argv, unsigned int lang_mask)
 {
   unsigned int n, i;
 
@@ -778,7 +757,7 @@ read_cmdline_options (unsigned int argc, const char **argv, unsigned int lang_ma
          continue;
        }
 
-      n = read_cmdline_option (argv + i, lang_mask);
+      n = handle_option (argv + i, lang_mask);
 
       if (!n)
        {
@@ -967,9 +946,6 @@ decode_options (unsigned int argc, const char **argv)
   else
     set_param_value ("min-crossjump-insns", initial_min_crossjump_insns);
 
-  /* Enable -Werror=coverage-mismatch by default */
-  enable_warning_as_error("coverage-mismatch", 1, lang_mask);
-
   if (first_time_p)
     {
       /* Initialize whether `char' is signed.  */
@@ -986,17 +962,15 @@ decode_options (unsigned int argc, const char **argv)
       flag_unwind_tables = targetm.unwind_tables_default;
     }
 
-#ifdef ENABLE_LTO
   /* Clear any options currently held for LTO.  */
   lto_clear_user_options ();
-#endif
 
 #ifdef OPTIMIZATION_OPTIONS
   /* Allow default optimizations to be specified on a per-machine basis.  */
   OPTIMIZATION_OPTIONS (optimize, optimize_size);
 #endif
 
-  read_cmdline_options (argc, argv, lang_mask);
+  handle_options (argc, argv, lang_mask);
 
   if (dump_base_name && ! IS_ABSOLUTE_PATH (dump_base_name))
     {
@@ -1150,6 +1124,9 @@ decode_options (unsigned int argc, const char **argv)
   if (flag_wpa || flag_ltrans)
     {
       /* These passes are not WHOPR compatible yet.  */
+      flag_ipa_cp = 0;
+      flag_ipa_reference = 0;
+      flag_ipa_type_escape = 0;
       flag_ipa_pta = 0;
       flag_ipa_struct_reorg = 0;
     }
@@ -1487,7 +1464,7 @@ print_specific_help (unsigned int include_flags,
 
 static int
 common_handle_option (size_t scode, const char *arg, int value,
-                     unsigned int lang_mask, int kind ATTRIBUTE_UNUSED)
+                     unsigned int lang_mask)
 {
   static bool verbose = false;
   enum opt_code code = (enum opt_code) scode;
@@ -2149,10 +2126,6 @@ common_handle_option (size_t scode, const char *arg, int value,
       flag_pedantic_errors = pedantic = 1;
       break;
 
-    case OPT_fwhopr:
-      flag_whopr = value;
-      break;
-
     case OPT_fsee:
     case OPT_fcse_skip_blocks:
     case OPT_floop_optimize:
@@ -2400,10 +2373,8 @@ get_option_state (int option, struct cl_option_state *state)
 /* Set *OPTION according to VALUE and ARG.  */
 
 void
-set_option (int opt_index, int value, const char *arg, int kind)
+set_option (const struct cl_option *option, int value, const char *arg)
 {
-  const struct cl_option *option = &cl_options[opt_index];
-
   if (!option->flag_var)
     return;
 
@@ -2433,9 +2404,6 @@ set_option (int opt_index, int value, const char *arg, int kind)
        *(const char **) option->flag_var = arg;
        break;
     }
-
-  if ((diagnostic_t)kind != DK_UNSPECIFIED)
-    diagnostic_classify_diagnostic (global_dc, opt_index, (diagnostic_t)kind);
 }
 
 
@@ -2479,8 +2447,8 @@ enable_warning_as_error (const char *arg, int value, unsigned int lang_mask)
          const struct cl_option * const option = cl_options + option_index;
 
          /* -Werror=foo implies -Wfoo.  */
-         if (option->var_type == CLVC_BOOLEAN)
-           handle_option (option_index, value, arg, lang_mask, (int)kind);
+         if (option->var_type == CLVC_BOOLEAN && option->flag_var)
+           *(int *) option->flag_var = 1;
 
          if (warning_as_error_callback)
            warning_as_error_callback (option_index);