2006-04-21 Andrew Haley <aph@redhat.com>

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

diff --git a/gcc/opts.c b/gcc/opts.c
index fcb8f6d..00b9716 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1,5 +1,5 @@
 /* Command line option handling.
 /* Command line option handling.

-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

    Contributed by Neil Booth.
 
 This file is part of GCC.
    Contributed by Neil Booth.
 
 This file is part of GCC.


@@ -16,8 +16,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free

-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */

 
 #include "config.h"
 #include "system.h"
 
 #include "config.h"
 #include "system.h"


@@ -38,6 +38,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "tm_p.h"              /* For OPTIMIZATION_OPTIONS.  */
 #include "insn-attr.h"         /* For INSN_SCHEDULING.  */
 #include "target.h"
 #include "tm_p.h"              /* For OPTIMIZATION_OPTIONS.  */
 #include "insn-attr.h"         /* For INSN_SCHEDULING.  */
 #include "target.h"

+#include "tree-pass.h"

 
 /* Value of the -G xx switch, and whether it was passed or not.  */
 unsigned HOST_WIDE_INT g_switch_value;
 
 /* Value of the -G xx switch, and whether it was passed or not.  */
 unsigned HOST_WIDE_INT g_switch_value;


@@ -79,6 +80,11 @@ bool use_gnu_debug_info_extensions;
 /* The default visibility for all symbols (unless overridden) */
 enum symbol_visibility default_visibility = VISIBILITY_DEFAULT;
 
 /* The default visibility for all symbols (unless overridden) */
 enum symbol_visibility default_visibility = VISIBILITY_DEFAULT;
 

+/* Disable unit-at-a-time for frontends that might be still broken in this
+   respect.  */
+  
+bool no_unit_at_a_time_default;
+

 /* Global visibility options.  */
 struct visibility_flags visibility_options;
 
 /* Global visibility options.  */
 struct visibility_flags visibility_options;
 


@@ -93,7 +99,6 @@ static const char undocumented_msg[] = N_("This switch lacks documentation");
 static bool profile_arc_flag_set, flag_profile_values_set;
 static bool flag_unroll_loops_set, flag_tracer_set;
 static bool flag_value_profile_transformations_set;
 static bool profile_arc_flag_set, flag_profile_values_set;
 static bool flag_unroll_loops_set, flag_tracer_set;
 static bool flag_value_profile_transformations_set;

-bool flag_speculative_prefetching_set;

 static bool flag_peel_loops_set, flag_branch_probabilities_set;
 
 /* Input file names.  */
 static bool flag_peel_loops_set, flag_branch_probabilities_set;
 
 /* Input file names.  */


@@ -101,7 +106,8 @@ const char **in_fnames;
 unsigned num_in_fnames;
 
 static size_t find_opt (const char *, int);
 unsigned num_in_fnames;
 
 static size_t find_opt (const char *, int);

-static int common_handle_option (size_t scode, const char *arg, int value);
+static int common_handle_option (size_t scode, const char *arg, int value,
+                                unsigned int lang_mask);

 static void handle_param (const char *);
 static void set_Wextra (int);
 static unsigned int handle_option (const char **argv, unsigned int lang_mask);
 static void handle_param (const char *);
 static void set_Wextra (int);
 static unsigned int handle_option (const char **argv, unsigned int lang_mask);


@@ -110,9 +116,10 @@ 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 wrap_help (const char *help, const char *item, unsigned int);
                                 unsigned int lang_mask);
 static void handle_options (unsigned int, const char **, unsigned int);
 static void wrap_help (const char *help, const char *item, unsigned int);

+static void print_target_help (void);

 static void print_help (void);
 static void print_param_help (void);
 static void print_help (void);
 static void print_param_help (void);

-static void print_filtered_help (unsigned int flag);
+static void print_filtered_help (unsigned int);

 static unsigned int print_switch (const char *text, unsigned int indent);
 static void set_debug_level (enum debug_info_type type, int extended,
                             const char *arg);
 static unsigned int print_switch (const char *text, unsigned int indent);
 static void set_debug_level (enum debug_info_type type, int extended,
                             const char *arg);


@@ -229,7 +236,7 @@ write_langs (unsigned int mask)
     if (mask & (1U << n))
       len += strlen (lang_name) + 1;
 
     if (mask & (1U << n))
       len += strlen (lang_name) + 1;
 

-  result = xmalloc (len);
+  result = XNEWVEC (char, len);

   len = 0;
   for (n = 0; (lang_name = lang_names[n]) != 0; n++)
     if (mask & (1U << n))
   len = 0;
   for (n = 0; (lang_name = lang_names[n]) != 0; n++)
     if (mask & (1U << n))


@@ -256,7 +263,7 @@ complain_wrong_lang (const char *text, const struct cl_option *option,
   bad_lang = write_langs (lang_mask);
 
   /* Eventually this should become a hard error IMO.  */
   bad_lang = write_langs (lang_mask);
 
   /* Eventually this should become a hard error IMO.  */

-  warning ("command line option \"%s\" is valid for %s but not for %s",
+  warning (0, "command line option \"%s\" is valid for %s but not for %s",

           text, ok_langs, bad_lang);
 
   free (ok_langs);
           text, ok_langs, bad_lang);
 
   free (ok_langs);


@@ -277,21 +284,23 @@ handle_option (const char **argv, unsigned int lang_mask)
 
   opt = argv[0];
 
 
   opt = argv[0];
 

-  /* Drop the "no-" from negative switches.  */
-  if ((opt[1] == 'W' || opt[1] == 'f')
+  opt_index = find_opt (opt + 1, lang_mask | CL_COMMON | CL_TARGET);
+  if (opt_index == cl_options_count
+      && (opt[1] == 'W' || opt[1] == 'f' || opt[1] == 'm')

       && opt[2] == 'n' && opt[3] == 'o' && opt[4] == '-')
     {
       && opt[2] == 'n' && opt[3] == 'o' && opt[4] == '-')
     {

+      /* Drop the "no-" from negative switches.  */

       size_t len = strlen (opt) - 3;
 
       size_t len = strlen (opt) - 3;
 

-      dup = xmalloc (len + 1);
+      dup = XNEWVEC (char, len + 1);

       dup[0] = '-';
       dup[1] = opt[1];
       memcpy (dup + 2, opt + 5, len - 2 + 1);
       opt = dup;
       value = 0;
       dup[0] = '-';
       dup[1] = opt[1];
       memcpy (dup + 2, opt + 5, len - 2 + 1);
       opt = dup;
       value = 0;

+      opt_index = find_opt (opt + 1, lang_mask | CL_COMMON | CL_TARGET);

     }
 
     }
 

-  opt_index = find_opt (opt + 1, lang_mask | CL_COMMON);

   if (opt_index == cl_options_count)
     goto done;
 
   if (opt_index == cl_options_count)
     goto done;
 


@@ -305,6 +314,14 @@ handle_option (const char **argv, unsigned int lang_mask)
   /* We've recognized this switch.  */
   result = 1;
 
   /* We've recognized this switch.  */
   result = 1;
 

+  /* Check to see if the option is disabled for this configuration.  */
+  if (option->flags & CL_DISABLED)
+    {
+      error ("command line option %qs"
+            " is not supported by this configuration", opt);
+      goto done;
+    }
+

   /* Sort out any argument the switch takes.  */
   if (option->flags & CL_JOINED)
     {
   /* Sort out any argument the switch takes.  */
   if (option->flags & CL_JOINED)
     {


@@ -335,7 +352,7 @@ handle_option (const char **argv, unsigned int lang_mask)
 
   /* Now we've swallowed any potential argument, complain if this
      is a switch for a different front end.  */
 
   /* Now we've swallowed any potential argument, complain if this
      is a switch for a different front end.  */

-  if (!(option->flags & (lang_mask | CL_COMMON)))
+  if (!(option->flags & (lang_mask | CL_COMMON | CL_TARGET)))

     {
       complain_wrong_lang (argv[0], option, lang_mask);
       goto done;
     {
       complain_wrong_lang (argv[0], option, lang_mask);
       goto done;


@@ -361,24 +378,43 @@ handle_option (const char **argv, unsigned int lang_mask)
     }
 
   if (option->flag_var)
     }
 
   if (option->flag_var)

-    {
-      if (option->has_set_value)
-       {
-         if (value)
-           *option->flag_var = option->set_value;
-         else
-           *option->flag_var = !option->set_value;
-       }
-      else
-       *option->flag_var = value;
-    }
+    switch (option->var_type)
+      {
+      case CLVC_BOOLEAN:
+       *(int *) option->flag_var = value;
+       break;
+
+      case CLVC_EQUAL:
+       *(int *) option->flag_var = (value
+                                    ? option->var_value
+                                    : !option->var_value);
+       break;
+
+      case CLVC_BIT_CLEAR:
+      case CLVC_BIT_SET:
+       if ((value != 0) == (option->var_type == CLVC_BIT_SET))
+         *(int *) option->flag_var |= option->var_value;
+       else
+         *(int *) option->flag_var &= ~option->var_value;
+       if (option->flag_var == &target_flags)
+         target_flags_explicit |= option->var_value;
+       break;
+
+      case CLVC_STRING:
+       *(const char **) option->flag_var = arg;
+       break;
+      }

   
   if (option->flags & lang_mask)
     if (lang_hooks.handle_option (opt_index, arg, value) == 0)
       result = 0;
 
   if (result && (option->flags & CL_COMMON))
   
   if (option->flags & lang_mask)
     if (lang_hooks.handle_option (opt_index, arg, value) == 0)
       result = 0;
 
   if (result && (option->flags & CL_COMMON))

-    if (common_handle_option (opt_index, arg, value) == 0)
+    if (common_handle_option (opt_index, arg, value, lang_mask) == 0)
+      result = 0;
+
+  if (result && (option->flags & CL_TARGET))
+    if (!targetm.handle_option (opt_index, arg, value))

       result = 0;
 
  done:
       result = 0;
 
  done:


@@ -489,9 +525,10 @@ decode_options (unsigned int argc, const char **argv)
 #endif
       flag_guess_branch_prob = 1;
       flag_cprop_registers = 1;
 #endif
       flag_guess_branch_prob = 1;
       flag_cprop_registers = 1;

-      flag_loop_optimize = 1;

       flag_if_conversion = 1;
       flag_if_conversion2 = 1;
       flag_if_conversion = 1;
       flag_if_conversion2 = 1;

+      flag_ipa_pure_const = 1;
+      flag_ipa_reference = 1;

       flag_tree_ccp = 1;
       flag_tree_dce = 1;
       flag_tree_dom = 1;
       flag_tree_ccp = 1;
       flag_tree_dce = 1;
       flag_tree_dom = 1;


@@ -501,6 +538,11 @@ decode_options (unsigned int argc, const char **argv)
       flag_tree_sra = 1;
       flag_tree_copyrename = 1;
       flag_tree_fre = 1;
       flag_tree_sra = 1;
       flag_tree_copyrename = 1;
       flag_tree_fre = 1;

+      flag_tree_copy_prop = 1;
+      flag_tree_sink = 1;
+      flag_tree_salias = 1;
+      if (!no_unit_at_a_time_default)
+        flag_unit_at_a_time = 1;

 
       if (!optimize_size)
        {
 
       if (!optimize_size)
        {


@@ -521,11 +563,9 @@ decode_options (unsigned int argc, const char **argv)
       flag_cse_skip_blocks = 1;
       flag_gcse = 1;
       flag_expensive_optimizations = 1;
       flag_cse_skip_blocks = 1;
       flag_gcse = 1;
       flag_expensive_optimizations = 1;

-      flag_strength_reduce = 1;
+      flag_ipa_type_escape = 1;

       flag_rerun_cse_after_loop = 1;
       flag_rerun_cse_after_loop = 1;

-      flag_rerun_loop_opt = 1;

       flag_caller_saves = 1;
       flag_caller_saves = 1;

-      flag_force_mem = 1;

       flag_peephole2 = 1;
 #ifdef INSN_SCHEDULING
       flag_schedule_insns = 1;
       flag_peephole2 = 1;
 #ifdef INSN_SCHEDULING
       flag_schedule_insns = 1;


@@ -536,7 +576,9 @@ decode_options (unsigned int argc, const char **argv)
       flag_delete_null_pointer_checks = 1;
       flag_reorder_blocks = 1;
       flag_reorder_functions = 1;
       flag_delete_null_pointer_checks = 1;
       flag_reorder_blocks = 1;
       flag_reorder_functions = 1;

-      flag_unit_at_a_time = 1;
+      flag_tree_store_ccp = 1;
+      flag_tree_store_copy_prop = 1;
+      flag_tree_vrp = 1;

 
       if (!optimize_size)
        {
 
       if (!optimize_size)
        {


@@ -589,14 +631,10 @@ decode_options (unsigned int argc, const char **argv)
 
   /* Initialize target_flags before OPTIMIZATION_OPTIONS so the latter can
      modify it.  */
 
   /* Initialize target_flags before OPTIMIZATION_OPTIONS so the latter can
      modify it.  */

-  target_flags = 0;
-  set_target_switch ("");
+  target_flags = targetm.default_target_flags;

 
 

-  /* Unwind tables are always present when a target has ABI-specified unwind
-     tables, so the default should be ON.  */
-#ifdef TARGET_UNWIND_INFO
-  flag_unwind_tables = TARGET_UNWIND_INFO;
-#endif
+  /* Some tagets have ABI-specified unwind tables.  */
+  flag_unwind_tables = targetm.unwind_tables_default;

 
 #ifdef OPTIMIZATION_OPTIONS
   /* Allow default optimizations to be specified on a per-machine basis.  */
 
 #ifdef OPTIMIZATION_OPTIONS
   /* Allow default optimizations to be specified on a per-machine basis.  */


@@ -631,7 +669,8 @@ decode_options (unsigned int argc, const char **argv)
         this to `2' if -Wall is used, so we can avoid giving out
         lots of errors for people who don't realize what -Wall does.  */
       if (warn_uninitialized == 1)
         this to `2' if -Wall is used, so we can avoid giving out
         lots of errors for people who don't realize what -Wall does.  */
       if (warn_uninitialized == 1)

-       warning ("-Wuninitialized is not supported without -O");
+       warning (OPT_Wuninitialized,
+                "-Wuninitialized is not supported without -O");

     }
 
   if (flag_really_no_inline == 2)
     }
 
   if (flag_really_no_inline == 2)


@@ -639,26 +678,39 @@ decode_options (unsigned int argc, const char **argv)
 
   /* The optimization to partition hot and cold basic blocks into separate
      sections of the .o and executable files does not work (currently)
 
   /* The optimization to partition hot and cold basic blocks into separate
      sections of the .o and executable files does not work (currently)

-     with exception handling.  If flag_exceptions is turned on we need to
+     with exception handling.  This is because there is no support for
+     generating unwind info.  If flag_exceptions is turned on we need to

      turn off the partitioning optimization.  */
 
   if (flag_exceptions && flag_reorder_blocks_and_partition)
     {
      turn off the partitioning optimization.  */
 
   if (flag_exceptions && flag_reorder_blocks_and_partition)
     {

-      warning 
+      inform 

            ("-freorder-blocks-and-partition does not work with exceptions");
       flag_reorder_blocks_and_partition = 0;
       flag_reorder_blocks = 1;
     }
 
            ("-freorder-blocks-and-partition does not work with exceptions");
       flag_reorder_blocks_and_partition = 0;
       flag_reorder_blocks = 1;
     }
 

-  /* The optimization to partition hot and cold basic blocks into
-     separate sections of the .o and executable files does not currently
-     work correctly with DWARF debugging turned on.  Until this is fixed
-     we will disable the optimization when DWARF debugging is set.  */
-  
-  if (flag_reorder_blocks_and_partition && write_symbols == DWARF2_DEBUG)
+  /* If user requested unwind info, then turn off the partitioning
+     optimization.  */
+
+  if (flag_unwind_tables && ! targetm.unwind_tables_default
+      && flag_reorder_blocks_and_partition)
+    {
+      inform ("-freorder-blocks-and-partition does not support unwind info");
+      flag_reorder_blocks_and_partition = 0;
+      flag_reorder_blocks = 1;
+    }
+
+  /* If the target requested unwind info, then turn off the partitioning
+     optimization with a different message.  Likewise, if the target does not
+     support named sections.  */
+
+  if (flag_reorder_blocks_and_partition
+      && (!targetm.have_named_sections
+         || (flag_unwind_tables && targetm.unwind_tables_default)))

     {
     {

-      warning
-       ("-freorder-blocks-and-partition does not work with -g (currently)");
+      inform 
+       ("-freorder-blocks-and-partition does not work on this architecture");

       flag_reorder_blocks_and_partition = 0;
       flag_reorder_blocks = 1;
     }
       flag_reorder_blocks_and_partition = 0;
       flag_reorder_blocks = 1;
     }


@@ -670,7 +722,8 @@ decode_options (unsigned int argc, const char **argv)
    VALUE assigned to a variable, it happens automatically.  */
 
 static int
    VALUE assigned to a variable, it happens automatically.  */
 
 static int

-common_handle_option (size_t scode, const char *arg, int value)
+common_handle_option (size_t scode, const char *arg, int value,
+                     unsigned int lang_mask)

 {
   enum opt_code code = (enum opt_code) scode;
 
 {
   enum opt_code code = (enum opt_code) scode;
 


@@ -686,7 +739,7 @@ common_handle_option (size_t scode, const char *arg, int value)
       break;
 
     case OPT__target_help:
       break;
 
     case OPT__target_help:

-      display_target_options ();
+      print_target_help ();

       exit_after_options = true;
       break;
 
       exit_after_options = true;
       break;
 


@@ -710,6 +763,33 @@ common_handle_option (size_t scode, const char *arg, int value)
       set_Wextra (value);
       break;
 
       set_Wextra (value);
       break;
 

+    case OPT_Werror_:
+      {
+       char *new_option;
+       int option_index;
+       new_option = XNEWVEC (char, strlen (arg) + 2);
+       new_option[0] = 'W';
+       strcpy (new_option+1, arg);
+       option_index = find_opt (new_option, lang_mask);
+       if (option_index == N_OPTS)
+         {
+           error ("-Werror-%s: No option -%s", arg, new_option);
+         }
+       else
+         {
+           int kind = value ? DK_ERROR : DK_WARNING;
+           diagnostic_classify_diagnostic (global_dc, option_index, kind);
+
+           /* -Werror=foo implies -Wfoo.  */
+           if (cl_options[option_index].var_type == CLVC_BOOLEAN
+               && cl_options[option_index].flag_var
+               && kind == DK_ERROR)
+             *(int *) cl_options[option_index].flag_var = 1;
+           free (new_option);
+         }
+      }
+      break;
+

     case OPT_Wextra:
       set_Wextra (value);
       break;
     case OPT_Wextra:
       set_Wextra (value);
       break;


@@ -793,6 +873,10 @@ common_handle_option (size_t scode, const char *arg, int value)
        return 0;
       break;
 
        return 0;
       break;
 

+    case OPT_fdiagnostics_show_option:
+      global_dc->show_option_requested = true;
+      break;
+

     case OPT_fdump_:
       if (!dump_switch_p (arg))
        return 0;
     case OPT_fdump_:
       if (!dump_switch_p (arg))
        return 0;


@@ -847,10 +931,6 @@ common_handle_option (size_t scode, const char *arg, int value)
         flag_tracer = value;
       if (!flag_value_profile_transformations_set)
         flag_value_profile_transformations = value;
         flag_tracer = value;
       if (!flag_value_profile_transformations_set)
         flag_value_profile_transformations = value;

-#ifdef HAVE_prefetch
-      if (0 && !flag_speculative_prefetching_set)
-       flag_speculative_prefetching = value;
-#endif

       break;
 
     case OPT_fprofile_generate:
       break;
 
     case OPT_fprofile_generate:


@@ -860,12 +940,6 @@ common_handle_option (size_t scode, const char *arg, int value)
         flag_profile_values = value;
       if (!flag_value_profile_transformations_set)
         flag_value_profile_transformations = value;
         flag_profile_values = value;
       if (!flag_value_profile_transformations_set)
         flag_value_profile_transformations = value;

-      if (!flag_unroll_loops_set)
-       flag_unroll_loops = value;
-#ifdef HAVE_prefetch
-      if (0 && !flag_speculative_prefetching_set)
-       flag_speculative_prefetching = value;
-#endif

       break;
 
     case OPT_fprofile_values:
       break;
 
     case OPT_fprofile_values:


@@ -883,7 +957,7 @@ common_handle_option (size_t scode, const char *arg, int value)
         else if (!strcmp(arg, "protected"))
           default_visibility = VISIBILITY_PROTECTED;
         else
         else if (!strcmp(arg, "protected"))
           default_visibility = VISIBILITY_PROTECTED;
         else

-          error ("unrecognised visibility value \"%s\"", arg);
+          error ("unrecognized visibility value \"%s\"", arg);

       }
       break;
 
       }
       break;
 


@@ -891,10 +965,6 @@ common_handle_option (size_t scode, const char *arg, int value)
       flag_value_profile_transformations_set = true;
       break;
 
       flag_value_profile_transformations_set = true;
       break;
 

-    case OPT_fspeculative_prefetching:
-      flag_speculative_prefetching_set = true;
-      break;
-

     case OPT_frandom_seed:
       /* The real switch is -fno-random-seed.  */
       if (value)
     case OPT_frandom_seed:
       /* The real switch is -fno-random-seed.  */
       if (value)


@@ -959,7 +1029,7 @@ common_handle_option (size_t scode, const char *arg, int value)
       else if (!strcmp (arg, "local-exec"))
        flag_tls_default = TLS_MODEL_LOCAL_EXEC;
       else
       else if (!strcmp (arg, "local-exec"))
        flag_tls_default = TLS_MODEL_LOCAL_EXEC;
       else

-       warning ("unknown tls-model \"%s\"", arg);
+       warning (0, "unknown tls-model \"%s\"", arg);

       break;
 
     case OPT_ftracer:
       break;
 
     case OPT_ftracer:


@@ -1000,10 +1070,6 @@ common_handle_option (size_t scode, const char *arg, int value)
       set_debug_level (XCOFF_DEBUG, code == OPT_gxcoff_, arg);
       break;
 
       set_debug_level (XCOFF_DEBUG, code == OPT_gxcoff_, arg);
       break;
 

-    case OPT_m:
-      set_target_switch (arg);
-      break;
-

     case OPT_o:
       asm_file_name = arg;
       break;
     case OPT_o:
       asm_file_name = arg;
       break;


@@ -1012,13 +1078,21 @@ common_handle_option (size_t scode, const char *arg, int value)
       flag_pedantic_errors = pedantic = 1;
       break;
 
       flag_pedantic_errors = pedantic = 1;
       break;
 

+    case OPT_fforce_mem:
+      warning (0, "-f[no-]force-mem is nop and option will be removed in 4.2");
+      break;
+
+    case OPT_floop_optimize:
+    case OPT_frerun_loop_opt:
+    case OPT_fstrength_reduce:
+      /* These are no-ops, preserved for backward compatibility.  */
+      break;
+

     default:
       /* If the flag was handled in a standard way, assume the lack of
         processing here is intentional.  */
     default:
       /* If the flag was handled in a standard way, assume the lack of
         processing here is intentional.  */

-      if (cl_options[scode].flag_var)
-       break;
-
-      abort ();
+      gcc_assert (cl_options[scode].flag_var);
+      break;

     }
 
   return 1;
     }
 
   return 1;


@@ -1136,7 +1210,7 @@ set_debug_level (enum debug_info_type type, int extended, const char *arg)
            }
 
          if (write_symbols == NO_DEBUG)
            }
 
          if (write_symbols == NO_DEBUG)

-           warning ("target system does not support debug output");
+           warning (0, "target system does not support debug output");

        }
     }
   else
        }
     }
   else


@@ -1165,6 +1239,27 @@ set_debug_level (enum debug_info_type type, int extended, const char *arg)
     }
 }
 
     }
 }
 

+/* Display help for target options.  */
+static void
+print_target_help (void)
+{
+  unsigned int i;
+  static bool displayed = false;
+
+  /* Avoid double printing for --help --target-help.  */
+  if (displayed)
+    return;
+
+  displayed = true;
+  for (i = 0; i < cl_options_count; i++)
+    if ((cl_options[i].flags & (CL_TARGET | CL_UNDOCUMENTED)) == CL_TARGET)
+      {
+       printf (_("\nTarget specific options:\n"));
+       print_filtered_help (CL_TARGET);
+       break;
+      }
+}
+

 /* Output --help text.  */
 static void
 print_help (void)
 /* Output --help text.  */
 static void
 print_help (void)


@@ -1191,8 +1286,7 @@ print_help (void)
              lang_names[i]);
       print_filtered_help (1U << i);
     }
              lang_names[i]);
       print_filtered_help (1U << i);
     }

-
-  display_target_options ();
+  print_target_help ();

 }
 
 /* Print the help for --param.  */
 }
 
 /* Print the help for --param.  */


@@ -1229,7 +1323,7 @@ print_filtered_help (unsigned int flag)
   const char *help, *opt, *tab;
   static char *printed;
 
   const char *help, *opt, *tab;
   static char *printed;
 

-  if (flag == CL_COMMON)
+  if (flag == CL_COMMON || flag == CL_TARGET)

     {
       filter = flag;
       if (!printed)
     {
       filter = flag;
       if (!printed)


@@ -1376,3 +1470,65 @@ wrap_help (const char *help, const char *item, unsigned int item_width)
     }
   while (remaining);
 }
     }
   while (remaining);
 }

+
+/* Return 1 if OPTION is enabled, 0 if it is disabled, or -1 if it isn't
+   a simple on-off switch.  */
+
+int
+option_enabled (int opt_idx)
+{
+  const struct cl_option *option = &(cl_options[opt_idx]);
+  if (option->flag_var)
+    switch (option->var_type)
+      {
+      case CLVC_BOOLEAN:
+       return *(int *) option->flag_var != 0;
+
+      case CLVC_EQUAL:
+       return *(int *) option->flag_var == option->var_value;
+
+      case CLVC_BIT_CLEAR:
+       return (*(int *) option->flag_var & option->var_value) == 0;
+
+      case CLVC_BIT_SET:
+       return (*(int *) option->flag_var & option->var_value) != 0;
+
+      case CLVC_STRING:
+       break;
+      }
+  return -1;
+}
+
+/* Fill STATE with the current state of option OPTION.  Return true if
+   there is some state to store.  */
+
+bool
+get_option_state (int option, struct cl_option_state *state)
+{
+  if (cl_options[option].flag_var == 0)
+    return false;
+
+  switch (cl_options[option].var_type)
+    {
+    case CLVC_BOOLEAN:
+    case CLVC_EQUAL:
+      state->data = cl_options[option].flag_var;
+      state->size = sizeof (int);
+      break;
+
+    case CLVC_BIT_CLEAR:
+    case CLVC_BIT_SET:
+      state->ch = option_enabled (option);
+      state->data = &state->ch;
+      state->size = 1;
+      break;
+
+    case CLVC_STRING:
+      state->data = *(const char **) cl_options[option].flag_var;
+      if (state->data == 0)
+       state->data = "";
+      state->size = strlen (state->data) + 1;
+      break;
+    }
+  return true;
+}