Daily bump.

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

diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 656aa2d..589b05b 100644 (file)
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -1,12 +1,13 @@
 /* C/ObjC/C++ command line option handling.
 /* C/ObjC/C++ command line option handling.

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

    Contributed by Neil Booth.
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
    Contributed by Neil Booth.
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -15,9 +16,8 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 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
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

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


@@ -33,11 +33,13 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "diagnostic.h"
 #include "intl.h"
 #include "cppdefault.h"
 #include "diagnostic.h"
 #include "intl.h"
 #include "cppdefault.h"

-#include "c-incpath.h"
+#include "incpath.h"

 #include "debug.h"             /* For debug_hooks.  */
 #include "opts.h"
 #include "options.h"
 #include "mkdeps.h"
 #include "debug.h"             /* For debug_hooks.  */
 #include "opts.h"
 #include "options.h"
 #include "mkdeps.h"

+#include "target.h"
+#include "tm_p.h"

 
 #ifndef DOLLARS_IN_IDENTIFIERS
 # define DOLLARS_IN_IDENTIFIERS true
 
 #ifndef DOLLARS_IN_IDENTIFIERS
 # define DOLLARS_IN_IDENTIFIERS true


@@ -52,7 +54,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 /* CPP's options.  */
 #endif
 
 /* CPP's options.  */

-static cpp_options *cpp_opts;
+cpp_options *cpp_opts;

 
 /* Input filename.  */
 static const char *this_input_filename;
 
 /* Input filename.  */
 static const char *this_input_filename;


@@ -76,6 +78,9 @@ static const char *deps_file;
 /* The prefix given by -iprefix, if any.  */
 static const char *iprefix;
 
 /* The prefix given by -iprefix, if any.  */
 static const char *iprefix;
 

+/* The multilib directory given by -imultilib, if any.  */
+static const char *imultilib;
+

 /* The system root, if any.  Overridden by -isysroot.  */
 static const char *sysroot = TARGET_SYSTEM_ROOT;
 
 /* The system root, if any.  Overridden by -isysroot.  */
 static const char *sysroot = TARGET_SYSTEM_ROOT;
 


@@ -100,12 +105,10 @@ static size_t deferred_count;
 /* Number of deferred options scanned for -include.  */
 static size_t include_cursor;
 
 /* Number of deferred options scanned for -include.  */
 static size_t include_cursor;
 

-/* Permit Fortran front-end options.  */
-static bool permit_fortran_options;
-

 static void set_Wimplicit (int);
 static void handle_OPT_d (const char *);
 static void set_std_cxx98 (int);
 static void set_Wimplicit (int);
 static void handle_OPT_d (const char *);
 static void set_std_cxx98 (int);

+static void set_std_cxx0x (int);

 static void set_std_c89 (int, int);
 static void set_std_c99 (int);
 static void check_deps_environment_vars (void);
 static void set_std_c89 (int, int);
 static void set_std_c99 (int);
 static void check_deps_environment_vars (void);


@@ -144,16 +147,16 @@ c_common_missing_argument (const char *opt, size_t code)
       return false;
 
     case OPT_fconstant_string_class_:
       return false;
 
     case OPT_fconstant_string_class_:

-      error ("no class name specified with \"%s\"", opt);
+      error ("no class name specified with %qs", opt);

       break;
 
     case OPT_A:
       break;
 
     case OPT_A:

-      error ("assertion missing after \"%s\"", opt);
+      error ("assertion missing after %qs", opt);

       break;
 
     case OPT_D:
     case OPT_U:
       break;
 
     case OPT_D:
     case OPT_U:

-      error ("macro name missing after \"%s\"", opt);
+      error ("macro name missing after %qs", opt);

       break;
 
     case OPT_F:
       break;
 
     case OPT_F:


@@ -162,7 +165,7 @@ c_common_missing_argument (const char *opt, size_t code)
     case OPT_isysroot:
     case OPT_isystem:
     case OPT_iquote:
     case OPT_isysroot:
     case OPT_isystem:
     case OPT_iquote:

-      error ("missing path after \"%s\"", opt);
+      error ("missing path after %qs", opt);

       break;
 
     case OPT_MF:
       break;
 
     case OPT_MF:


@@ -171,12 +174,12 @@ c_common_missing_argument (const char *opt, size_t code)
     case OPT_include:
     case OPT_imacros:
     case OPT_o:
     case OPT_include:
     case OPT_imacros:
     case OPT_o:

-      error ("missing filename after \"%s\"", opt);
+      error ("missing filename after %qs", opt);

       break;
 
     case OPT_MQ:
     case OPT_MT:
       break;
 
     case OPT_MQ:
     case OPT_MT:

-      error ("missing makefile target after \"%s\"", opt);
+      error ("missing makefile target after %qs", opt);

       break;
     }
 
       break;
     }
 


@@ -194,10 +197,10 @@ defer_opt (enum opt_code code, const char *arg)
 
 /* Common initialization before parsing options.  */
 unsigned int
 
 /* Common initialization before parsing options.  */
 unsigned int

-c_common_init_options (unsigned int argc, const char ** ARG_UNUSED (argv))
+c_common_init_options (unsigned int argc, const char **argv)

 {
   static const unsigned int lang_flags[] = {CL_C, CL_ObjC, CL_CXX, CL_ObjCXX};
 {
   static const unsigned int lang_flags[] = {CL_C, CL_ObjC, CL_CXX, CL_ObjCXX};

-  unsigned int result;
+  unsigned int i, result;

 
   /* This is conditionalized only because that is the way the front
      ends used to do it.  Maybe this should be unconditional?  */
 
   /* This is conditionalized only because that is the way the front
      ends used to do it.  Maybe this should be unconditional?  */


@@ -212,7 +215,7 @@ c_common_init_options (unsigned int argc, const char ** ARG_UNUSED (argv))
     }
 
   parse_in = cpp_create_reader (c_dialect_cxx () ? CLK_GNUCXX: CLK_GNUC89,
     }
 
   parse_in = cpp_create_reader (c_dialect_cxx () ? CLK_GNUCXX: CLK_GNUC89,

-                               ident_hash, &line_table);
+                               ident_hash, line_table);

 
   cpp_opts = cpp_get_options (parse_in);
   cpp_opts->dollars_in_ident = DOLLARS_IN_IDENTIFIERS;
 
   cpp_opts = cpp_get_options (parse_in);
   cpp_opts->dollars_in_ident = DOLLARS_IN_IDENTIFIERS;


@@ -222,24 +225,28 @@ c_common_init_options (unsigned int argc, const char ** ARG_UNUSED (argv))
      before passing on command-line options to cpplib.  */
   cpp_opts->warn_dollars = 0;
 
      before passing on command-line options to cpplib.  */
   cpp_opts->warn_dollars = 0;
 

-  flag_const_strings = c_dialect_cxx ();

   flag_exceptions = c_dialect_cxx ();
   warn_pointer_arith = c_dialect_cxx ();
   flag_exceptions = c_dialect_cxx ();
   warn_pointer_arith = c_dialect_cxx ();

+  warn_write_strings = c_dialect_cxx();

 
 

-  deferred_opts = xmalloc (argc * sizeof (struct deferred_opt));
+  /* By default, C99-like requirements for complex multiply and divide.  */
+  flag_complex_method = 2;
+
+  deferred_opts = XNEWVEC (struct deferred_opt, argc);

 
   result = lang_flags[c_language];
 
 
   result = lang_flags[c_language];
 

-  /* If potentially preprocessing Fortran we have to accept its front
-     end options since the driver passes most of them through.  */
-#ifdef CL_F77
-  if (c_language == clk_c && argc > 2
-      && !strcmp (argv[2], "-traditional-cpp" ))
+  if (c_language == clk_c)

     {
     {

-      permit_fortran_options = true;
-      result |= CL_F77;
+      /* If preprocessing assembly language, accept any of the C-family
+        front end options since the driver may pass them through.  */
+      for (i = 1; i < argc; i++)
+       if (! strcmp (argv[i], "-lang-asm"))
+         {
+           result |= CL_C | CL_ObjC | CL_CXX | CL_ObjCXX;
+           break;
+         }

     }
     }

-#endif

 
   return result;
 }
 
   return result;
 }


@@ -255,12 +262,21 @@ c_common_handle_option (size_t scode, const char *arg, int value)
   enum opt_code code = (enum opt_code) scode;
   int result = 1;
 
   enum opt_code code = (enum opt_code) scode;
   int result = 1;
 

+  /* Prevent resetting the language standard to a C dialect when the driver
+     has already determined that we're looking at assembler input.  */
+  bool preprocessing_asm_p = (cpp_get_options (parse_in)->lang == CLK_ASM);
+ 

   switch (code)
     {
     default:
       if (cl_options[code].flags & (CL_C | CL_CXX | CL_ObjC | CL_ObjCXX))
   switch (code)
     {
     default:
       if (cl_options[code].flags & (CL_C | CL_CXX | CL_ObjC | CL_ObjCXX))

-       break;
-      result = permit_fortran_options;
+       {
+         if ((option->flags & CL_TARGET)
+             && ! targetcm.handle_c_option (scode, arg, value))
+           result = 0;
+         break;
+       }
+      result = 0;

       break;
 
     case OPT__output_pch_:
       break;
 
     case OPT__output_pch_:


@@ -305,7 +321,7 @@ c_common_handle_option (size_t scode, const char *arg, int value)
            error ("-I- specified twice");
          quote_chain_split = true;
          split_quote_chain ();
            error ("-I- specified twice");
          quote_chain_split = true;
          split_quote_chain ();

-         inform ("obsolete option -I- used, please use -iquote instead");
+         inform (input_location, "obsolete option -I- used, please use -iquote instead");

        }
       break;
 
        }
       break;
 


@@ -360,7 +376,7 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       break;
 
     case OPT_Wall:
       break;
 
     case OPT_Wall:

-      set_Wunused (value);
+      warn_unused = value;

       set_Wformat (value);
       set_Wimplicit (value);
       warn_char_subscripts = value;
       set_Wformat (value);
       set_Wimplicit (value);
       warn_char_subscripts = value;


@@ -368,10 +384,14 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       warn_parentheses = value;
       warn_return_type = value;
       warn_sequence_point = value;     /* Was C only.  */
       warn_parentheses = value;
       warn_return_type = value;
       warn_sequence_point = value;     /* Was C only.  */

-      if (c_dialect_cxx ())
-       warn_sign_compare = value;

       warn_switch = value;
       warn_switch = value;

-      warn_strict_aliasing = value;
+      if (warn_strict_aliasing == -1)
+       set_Wstrict_aliasing (value);
+      warn_address = value;
+      if (warn_strict_overflow == -1)
+       warn_strict_overflow = value;
+      warn_array_bounds = value;
+      warn_volatile_register_var = value;

 
       /* Only warn about unknown pragmas that are not in system
         headers.  */
 
       /* Only warn about unknown pragmas that are not in system
         headers.  */


@@ -384,21 +404,30 @@ c_common_handle_option (size_t scode, const char *arg, int value)
        warn_uninitialized = (value ? 2 : 0);
 
       if (!c_dialect_cxx ())
        warn_uninitialized = (value ? 2 : 0);
 
       if (!c_dialect_cxx ())

-       /* We set this to 2 here, but 1 in -Wmain, so -ffreestanding
-          can turn it off only if it's not explicit.  */
-       warn_main = value * 2;
+       {
+         /* We set this to 2 here, but 1 in -Wmain, so -ffreestanding
+            can turn it off only if it's not explicit.  */
+         if (warn_main == -1)
+           warn_main = (value ? 2 : 0);
+       }

       else
        {
          /* C++-specific warnings.  */
       else
        {
          /* C++-specific warnings.  */

-         warn_nonvdtor = value;
+          warn_sign_compare = value;

          warn_reorder = value;
          warn_reorder = value;

-         warn_nontemplate_friend = value;
+          warn_cxx0x_compat = value;

        }
 
       cpp_opts->warn_trigraphs = value;
       cpp_opts->warn_comments = value;
       cpp_opts->warn_num_sign_change = value;
        }
 
       cpp_opts->warn_trigraphs = value;
       cpp_opts->warn_comments = value;
       cpp_opts->warn_num_sign_change = value;

-      cpp_opts->warn_multichar = value;        /* Was C++ only.  */
+
+      if (warn_pointer_sign == -1)
+       warn_pointer_sign = 1;
+      break;
+
+    case OPT_Wbuiltin_macro_redefined:
+      cpp_opts->warn_builtin_macro_redefined = value;

       break;
 
     case OPT_Wcomment:
       break;
 
     case OPT_Wcomment:


@@ -410,20 +439,19 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       cpp_opts->warn_deprecated = value;
       break;
 
       cpp_opts->warn_deprecated = value;
       break;
 

-    case OPT_Wdiv_by_zero:
-      warn_div_by_zero = value;
-      break;
-

     case OPT_Wendif_labels:
       cpp_opts->warn_endif_labels = value;
       break;
 
     case OPT_Werror:
       cpp_opts->warnings_are_errors = value;
     case OPT_Wendif_labels:
       cpp_opts->warn_endif_labels = value;
       break;
 
     case OPT_Werror:
       cpp_opts->warnings_are_errors = value;

+      global_dc->warning_as_error_requested = value;

       break;
 
       break;
 

-    case OPT_Werror_implicit_function_declaration:
-      mesg_implicit_function_declaration = 2;
+    case OPT_Werror_implicit_function_declaration: 
+      /* For backward compatibility, this is the same as
+        -Werror=implicit-function-declaration.  */
+      enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC); 

       break;
 
     case OPT_Wformat:
       break;
 
     case OPT_Wformat:


@@ -446,13 +474,6 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       cpp_opts->warn_invalid_pch = value;
       break;
 
       cpp_opts->warn_invalid_pch = value;
       break;
 

-    case OPT_Wmain:
-      if (value)
-       warn_main = 1;
-      else
-       warn_main = -1;
-      break;
-

     case OPT_Wmissing_include_dirs:
       cpp_opts->warn_missing_include_dirs = value;
       break;
     case OPT_Wmissing_include_dirs:
       cpp_opts->warn_missing_include_dirs = value;
       break;


@@ -461,10 +482,27 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       cpp_opts->warn_multichar = value;
       break;
 
       cpp_opts->warn_multichar = value;
       break;
 

+    case OPT_Wnormalized_:
+      if (!value || (arg && strcasecmp (arg, "none") == 0))
+       cpp_opts->warn_normalize = normalized_none;
+      else if (!arg || strcasecmp (arg, "nfkc") == 0)
+       cpp_opts->warn_normalize = normalized_KC;
+      else if (strcasecmp (arg, "id") == 0)
+       cpp_opts->warn_normalize = normalized_identifier_C;
+      else if (strcasecmp (arg, "nfc") == 0)
+       cpp_opts->warn_normalize = normalized_C;
+      else
+       error ("argument %qs to %<-Wnormalized%> not recognized", arg);
+      break;
+

     case OPT_Wreturn_type:
       warn_return_type = value;
       break;
 
     case OPT_Wreturn_type:
       warn_return_type = value;
       break;
 

+    case OPT_Wstrict_null_sentinel:
+      warn_strict_null_sentinel = value;
+      break;
+

     case OPT_Wsystem_headers:
       cpp_opts->warn_system_headers = value;
       break;
     case OPT_Wsystem_headers:
       cpp_opts->warn_system_headers = value;
       break;


@@ -496,10 +534,13 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       break;
 
     case OPT_Wwrite_strings:
       break;
 
     case OPT_Wwrite_strings:

-      if (!c_dialect_cxx ())
-       flag_const_strings = value;
-      else
-       warn_write_strings = value;
+      warn_write_strings = value;
+      break;
+
+    case OPT_Weffc__:
+      warn_ecpp = value;
+      if (value)
+        warn_nonvdtor = true;

       break;
 
     case OPT_ansi:
       break;
 
     case OPT_ansi:


@@ -538,7 +579,7 @@ c_common_handle_option (size_t scode, const char *arg, int value)
     case OPT_fvtable_thunks:
     case OPT_fxref:
     case OPT_fvtable_gc:
     case OPT_fvtable_thunks:
     case OPT_fxref:
     case OPT_fvtable_gc:

-      warning ("switch \"%s\" is no longer supported", option->opt_text);
+      warning (0, "switch %qs is no longer supported", option->opt_text);

       break;
 
     case OPT_faccess_control:
       break;
 
     case OPT_faccess_control:


@@ -560,6 +601,10 @@ c_common_handle_option (size_t scode, const char *arg, int value)
        disable_builtin_function (arg);
       break;
 
        disable_builtin_function (arg);
       break;
 

+    case OPT_fdirectives_only:
+      cpp_opts->directives_only = value;
+      break;
+

     case OPT_fdollars_in_identifiers:
       cpp_opts->dollars_in_ident = value;
       break;
     case OPT_fdollars_in_identifiers:
       cpp_opts->dollars_in_ident = value;
       break;


@@ -570,9 +615,6 @@ c_common_handle_option (size_t scode, const char *arg, int value)
     case OPT_fhosted:
       flag_hosted = value;
       flag_no_builtin = !value;
     case OPT_fhosted:
       flag_hosted = value;
       flag_no_builtin = !value;

-      /* warn_main will be 2 if set by -Wall, 1 if set by -Wmain */
-      if (!value && warn_main == 2)
-       warn_main = 0;

       break;
 
     case OPT_fshort_double:
       break;
 
     case OPT_fshort_double:


@@ -589,7 +631,6 @@ c_common_handle_option (size_t scode, const char *arg, int value)
 
     case OPT_fsigned_bitfields:
       flag_signed_bitfields = value;
 
     case OPT_fsigned_bitfields:
       flag_signed_bitfields = value;

-      explicit_flag_signed_bitfields = 1;

       break;
 
     case OPT_fsigned_char:
       break;
 
     case OPT_fsigned_char:


@@ -598,7 +639,6 @@ c_common_handle_option (size_t scode, const char *arg, int value)
 
     case OPT_funsigned_bitfields:
       flag_signed_bitfields = !value;
 
     case OPT_funsigned_bitfields:
       flag_signed_bitfields = !value;

-      explicit_flag_signed_bitfields = 1;

       break;
 
     case OPT_funsigned_char:
       break;
 
     case OPT_funsigned_char:


@@ -613,10 +653,6 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       flag_conserve_space = value;
       break;
 
       flag_conserve_space = value;
       break;
 

-    case OPT_fconst_strings:
-      flag_const_strings = value;
-      break;
-

     case OPT_fconstant_string_class_:
       constant_string_class_name = arg;
       break;
     case OPT_fconstant_string_class_:
       constant_string_class_name = arg;
       break;


@@ -633,11 +669,8 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       flag_enforce_eh_specs = value;
       break;
 
       flag_enforce_eh_specs = value;
       break;
 

-    case OPT_ffixed_form:
-    case OPT_ffixed_line_length_:
-      /* Fortran front end options ignored when preprocessing only.  */
-      if (!flag_preprocess_only)
-        result = 0;
+    case OPT_fextended_identifiers:
+      cpp_opts->extended_identifiers = value;

       break;
 
     case OPT_ffor_scope:
       break;
 
     case OPT_ffor_scope:


@@ -653,7 +686,7 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       break;
 
     case OPT_fhandle_exceptions:
       break;
 
     case OPT_fhandle_exceptions:

-      warning ("-fhandle-exceptions has been renamed -fexceptions (and is now on by default)");
+      warning (0, "-fhandle-exceptions has been renamed -fexceptions (and is now on by default)");

       flag_exceptions = value;
       break;
 
       flag_exceptions = value;
       break;
 


@@ -669,6 +702,10 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       flag_implicit_templates = value;
       break;
 
       flag_implicit_templates = value;
       break;
 

+    case OPT_flax_vector_conversions:
+      flag_lax_vector_conversions = value;
+      break;
+

     case OPT_fms_extensions:
       flag_ms_extensions = value;
       break;
     case OPT_fms_extensions:
       flag_ms_extensions = value;
       break;


@@ -685,14 +722,6 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       flag_no_nonansi_builtin = !value;
       break;
 
       flag_no_nonansi_builtin = !value;
       break;
 

-    case OPT_fobjc_exceptions:
-      flag_objc_exceptions = value;
-      break;
-
-    case OPT_fobjc_sjlj_exceptions:
-      flag_objc_sjlj_exceptions = value;
-      break;
-

     case OPT_foperator_names:
       cpp_opts->operator_names = value;
       break;
     case OPT_foperator_names:
       cpp_opts->operator_names = value;
       break;


@@ -720,7 +749,7 @@ c_common_handle_option (size_t scode, const char *arg, int value)
     case OPT_freplace_objc_classes:
       flag_replace_objc_classes = value;
       break;
     case OPT_freplace_objc_classes:
       flag_replace_objc_classes = value;
       break;

-      
+

     case OPT_frepo:
       flag_use_repository = value;
       if (value)
     case OPT_frepo:
       flag_use_repository = value;
       if (value)


@@ -765,10 +794,22 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       flag_use_cxa_atexit = value;
       break;
 
       flag_use_cxa_atexit = value;
       break;
 

+    case OPT_fuse_cxa_get_exception_ptr:
+      flag_use_cxa_get_exception_ptr = value;
+      break;
+
+    case OPT_fvisibility_inlines_hidden:
+      visibility_options.inlines_hidden = value;
+      break;
+

     case OPT_fweak:
       flag_weak = value;
       break;
 
     case OPT_fweak:
       flag_weak = value;
       break;
 

+    case OPT_fthreadsafe_statics:
+      flag_threadsafe_statics = value;
+      break;
+

     case OPT_fzero_link:
       flag_zero_link = value;
       break;
     case OPT_fzero_link:
       flag_zero_link = value;
       break;


@@ -777,6 +818,18 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       flag_gen_declaration = 1;
       break;
 
       flag_gen_declaration = 1;
       break;
 

+    case OPT_femit_struct_debug_baseonly:
+      set_struct_debug_option ("base");
+      break;
+
+    case OPT_femit_struct_debug_reduced:
+      set_struct_debug_option ("dir:ord:sys,dir:gen:any,ind:base");
+      break;
+
+    case OPT_femit_struct_debug_detailed_:
+      set_struct_debug_option (arg);
+      break;
+

     case OPT_idirafter:
       add_path (xstrdup (arg), AFTER, 0, true);
       break;
     case OPT_idirafter:
       add_path (xstrdup (arg), AFTER, 0, true);
       break;


@@ -786,6 +839,10 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       defer_opt (code, arg);
       break;
 
       defer_opt (code, arg);
       break;
 

+    case OPT_imultilib:
+      imultilib = arg;
+      break;
+

     case OPT_iprefix:
       iprefix = arg;
       break;
     case OPT_iprefix:
       iprefix = arg;
       break;


@@ -843,41 +900,63 @@ c_common_handle_option (size_t scode, const char *arg, int value)
     case OPT_pedantic:
       cpp_opts->pedantic = 1;
       cpp_opts->warn_endif_labels = 1;
     case OPT_pedantic:
       cpp_opts->pedantic = 1;
       cpp_opts->warn_endif_labels = 1;

+      if (warn_pointer_sign == -1)
+       warn_pointer_sign = 1;
+      if (warn_overlength_strings == -1)
+       warn_overlength_strings = 1;
+      if (warn_main == -1)
+       warn_main = 2;

       break;
 
     case OPT_print_objc_runtime_info:
       print_struct_values = 1;
       break;
 
       break;
 
     case OPT_print_objc_runtime_info:
       print_struct_values = 1;
       break;
 

+    case OPT_print_pch_checksum:
+      c_common_print_pch_checksum (stdout);
+      exit_after_options = true;
+      break;
+

     case OPT_remap:
       cpp_opts->remap = 1;
       break;
 
     case OPT_std_c__98:
     case OPT_std_gnu__98:
     case OPT_remap:
       cpp_opts->remap = 1;
       break;
 
     case OPT_std_c__98:
     case OPT_std_gnu__98:

-      set_std_cxx98 (code == OPT_std_c__98 /* ISO */);
+      if (!preprocessing_asm_p)
+       set_std_cxx98 (code == OPT_std_c__98 /* ISO */);
+      break;
+
+    case OPT_std_c__0x:
+    case OPT_std_gnu__0x:
+      if (!preprocessing_asm_p)
+       set_std_cxx0x (code == OPT_std_c__0x /* ISO */);

       break;
 
     case OPT_std_c89:
     case OPT_std_iso9899_1990:
     case OPT_std_iso9899_199409:
       break;
 
     case OPT_std_c89:
     case OPT_std_iso9899_1990:
     case OPT_std_iso9899_199409:

-      set_std_c89 (code == OPT_std_iso9899_199409 /* c94 */, true /* ISO */);
+      if (!preprocessing_asm_p)
+       set_std_c89 (code == OPT_std_iso9899_199409 /* c94 */, true /* ISO */);

       break;
 
     case OPT_std_gnu89:
       break;
 
     case OPT_std_gnu89:

-      set_std_c89 (false /* c94 */, false /* ISO */);
+      if (!preprocessing_asm_p)
+       set_std_c89 (false /* c94 */, false /* ISO */);

       break;
 
     case OPT_std_c99:
     case OPT_std_c9x:
     case OPT_std_iso9899_1999:
     case OPT_std_iso9899_199x:
       break;
 
     case OPT_std_c99:
     case OPT_std_c9x:
     case OPT_std_iso9899_1999:
     case OPT_std_iso9899_199x:

-      set_std_c99 (true /* ISO */);
+      if (!preprocessing_asm_p)
+       set_std_c99 (true /* ISO */);

       break;
 
     case OPT_std_gnu99:
     case OPT_std_gnu9x:
       break;
 
     case OPT_std_gnu99:
     case OPT_std_gnu9x:

-      set_std_c99 (false /* ISO */);
+      if (!preprocessing_asm_p)
+       set_std_c99 (false /* ISO */);

       break;
 
     case OPT_trigraphs:
       break;
 
     case OPT_trigraphs:


@@ -913,7 +992,7 @@ c_common_post_options (const char **pfilename)
   /* Canonicalize the input and output filenames.  */
   if (in_fnames == NULL)
     {
   /* Canonicalize the input and output filenames.  */
   if (in_fnames == NULL)
     {

-      in_fnames = xmalloc (sizeof (in_fnames[0]));
+      in_fnames = XNEWVEC (const char *, 1);

       in_fnames[0] = "";
     }
   else if (strcmp (in_fnames[0], "-") == 0)
       in_fnames[0] = "";
     }
   else if (strcmp (in_fnames[0], "-") == 0)


@@ -929,24 +1008,21 @@ c_common_post_options (const char **pfilename)
 
   sanitize_cpp_opts ();
 
 
   sanitize_cpp_opts ();
 

-  register_include_chains (parse_in, sysroot, iprefix,
+  register_include_chains (parse_in, sysroot, iprefix, imultilib,

                           std_inc, std_cxx_inc && c_dialect_cxx (), verbose);
 
                           std_inc, std_cxx_inc && c_dialect_cxx (), verbose);
 

-  flag_inline_trees = 1;
-
-  /* Use tree inlining.  */
-  if (!flag_no_inline)
-    flag_no_inline = 1;
-  if (flag_inline_functions)
-    {
-      flag_inline_trees = 2;
-      flag_inline_functions = 0;
-    }
+#ifdef C_COMMON_OVERRIDE_OPTIONS
+  /* Some machines may reject certain combinations of C
+     language-specific options.  */
+  C_COMMON_OVERRIDE_OPTIONS;
+#endif

 
 

-  /* If we are given more than one input file, we must use
-     unit-at-a-time mode.  */
-  if (num_in_fnames > 1)
-    flag_unit_at_a_time = 1;
+  /* By default we use C99 inline semantics in GNU99 or C99 mode.  C99
+     inline semantics are not supported in GNU89 or C89 mode.  */
+  if (flag_gnu89_inline == -1)
+    flag_gnu89_inline = !flag_isoc99;
+  else if (!flag_gnu89_inline && !flag_isoc99)
+    error ("-fno-gnu89-inline is only supported in GNU99 or C99 mode");

 
   /* Default to ObjC sjlj exception handling if NeXT runtime.  */
   if (flag_objc_sjlj_exceptions < 0)
 
   /* Default to ObjC sjlj exception handling if NeXT runtime.  */
   if (flag_objc_sjlj_exceptions < 0)


@@ -954,25 +1030,88 @@ c_common_post_options (const char **pfilename)
   if (flag_objc_exceptions && !flag_objc_sjlj_exceptions)
     flag_exceptions = 1;
 
   if (flag_objc_exceptions && !flag_objc_sjlj_exceptions)
     flag_exceptions = 1;
 

-  /* -Wextra implies -Wsign-compare, but not if explicitly
-      overridden.  */
+  /* -Wextra implies -Wtype-limits, -Wclobbered, 
+     -Wempty-body, -Wsign-compare, 
+     -Wmissing-field-initializers, -Wmissing-parameter-type
+     -Wold-style-declaration, -Woverride-init and -Wignored-qualifiers
+     but not if explicitly overridden.  */
+  if (warn_type_limits == -1)
+    warn_type_limits = extra_warnings;
+  if (warn_clobbered == -1)
+    warn_clobbered = extra_warnings;
+  if (warn_empty_body == -1)
+    warn_empty_body = extra_warnings;

   if (warn_sign_compare == -1)
     warn_sign_compare = extra_warnings;
   if (warn_sign_compare == -1)
     warn_sign_compare = extra_warnings;

+  if (warn_missing_field_initializers == -1)
+    warn_missing_field_initializers = extra_warnings;
+  if (warn_missing_parameter_type == -1)
+    warn_missing_parameter_type = extra_warnings;
+  if (warn_old_style_declaration == -1)
+    warn_old_style_declaration = extra_warnings;
+  if (warn_override_init == -1)
+    warn_override_init = extra_warnings;
+  if (warn_ignored_qualifiers == -1)
+    warn_ignored_qualifiers = extra_warnings;
+
+  /* -Wpointer_sign is disabled by default, but it is enabled if any
+     of -Wall or -pedantic are given.  */
+  if (warn_pointer_sign == -1)
+    warn_pointer_sign = 0;
+
+  if (warn_strict_aliasing == -1)
+    warn_strict_aliasing = 0;
+  if (warn_strict_overflow == -1)
+    warn_strict_overflow = 0;
+
+  /* -Woverlength-strings is off by default, but is enabled by -pedantic.
+     It is never enabled in C++, as the minimum limit is not normative
+     in that standard.  */
+  if (warn_overlength_strings == -1 || c_dialect_cxx ())
+    warn_overlength_strings = 0;
+
+  /* Wmain is enabled by default in C++ but not in C.  */
+  /* Wmain is disabled by default for -ffreestanding (!flag_hosted),
+     even if -Wall was given (warn_main will be 2 if set by -Wall, 1
+     if set by -Wmain).  */
+  if (warn_main == -1)
+    warn_main = (c_dialect_cxx () && flag_hosted) ? 1 : 0;
+  else if (warn_main == 2)
+    warn_main = flag_hosted ? 1 : 0;
+
+  /* In C, -Wconversion enables -Wsign-conversion (unless disabled
+     through -Wno-sign-conversion). While in C++,
+     -Wsign-conversion needs to be requested explicitly.  */
+  if (warn_sign_conversion == -1)
+    warn_sign_conversion =  (c_dialect_cxx ()) ? 0 : warn_conversion;
+

 
   /* Special format checking options don't work without -Wformat; warn if
      they are used.  */
 
   /* Special format checking options don't work without -Wformat; warn if
      they are used.  */

-  if (warn_format_y2k && !warn_format)
-    warning ("-Wformat-y2k ignored without -Wformat");
-  if (warn_format_extra_args && !warn_format)
-    warning ("-Wformat-extra-args ignored without -Wformat");
-  if (warn_format_zero_length && !warn_format)
-    warning ("-Wformat-zero-length ignored without -Wformat");
-  if (warn_format_nonliteral && !warn_format)
-    warning ("-Wformat-nonliteral ignored without -Wformat");
-  if (warn_format_security && !warn_format)
-    warning ("-Wformat-security ignored without -Wformat");
-  if (warn_missing_format_attribute && !warn_format)
-    warning ("-Wmissing-format-attribute ignored without -Wformat");
+  if (!warn_format)
+    {
+      warning (OPT_Wformat_y2k,
+              "-Wformat-y2k ignored without -Wformat");
+      warning (OPT_Wformat_extra_args,
+              "-Wformat-extra-args ignored without -Wformat");
+      warning (OPT_Wformat_zero_length,
+              "-Wformat-zero-length ignored without -Wformat");
+      warning (OPT_Wformat_nonliteral,
+              "-Wformat-nonliteral ignored without -Wformat");
+      warning (OPT_Wformat_contains_nul,
+              "-Wformat-contains-nul ignored without -Wformat");
+      warning (OPT_Wformat_security,
+              "-Wformat-security ignored without -Wformat");
+    }
+
+  /* -Wimplicit-function-declaration is enabled by default for C99.  */
+  if (warn_implicit_function_declaration == -1) 
+    warn_implicit_function_declaration = flag_isoc99;
+
+  /* If we're allowing C++0x constructs, don't warn about C++0x
+     compatibility problems.  */
+  if (cxx_dialect == cxx0x)
+    warn_cxx0x_compat = 0;

 
   if (flag_preprocess_only)
     {
 
   if (flag_preprocess_only)
     {


@@ -1025,7 +1164,7 @@ c_common_post_options (const char **pfilename)
     }
 
   if (flag_working_directory
     }
 
   if (flag_working_directory

-      && flag_preprocess_only && ! flag_no_line_commands)
+      && flag_preprocess_only && !flag_no_line_commands)

     pp_dir_change (parse_in, get_src_pwd ());
 
   return flag_preprocess_only;
     pp_dir_change (parse_in, get_src_pwd ());
 
   return flag_preprocess_only;


@@ -1048,6 +1187,12 @@ c_common_init (void)
      are known.  */
   cpp_init_iconv (parse_in);
 
      are known.  */
   cpp_init_iconv (parse_in);
 

+  if (version_flag)
+    c_common_print_pch_checksum (stderr);
+
+  /* Has to wait until now so that cpplib has its hash table.  */
+  init_pragma ();
+

   if (flag_preprocess_only)
     {
       finish_options ();
   if (flag_preprocess_only)
     {
       finish_options ();


@@ -1055,9 +1200,6 @@ c_common_init (void)
       return false;
     }
 
       return false;
     }
 

-  /* Has to wait until now so that cpplib has its hash table.  */
-  init_pragma ();
-

   return true;
 }
 
   return true;
 }
 


@@ -1068,32 +1210,50 @@ c_common_parse_file (int set_yydebug)
 {
   unsigned int i;
 
 {
   unsigned int i;
 

-  /* Enable parser debugging, if requested and we can.  If requested
-     and we can't, notify the user.  */
-#if YYDEBUG != 0
-  yydebug = set_yydebug;
-#else

   if (set_yydebug)
   if (set_yydebug)

-    warning ("YYDEBUG was not defined at build time, -dy ignored");
-#endif
+    switch (c_language)
+      {
+      case clk_c:
+       warning(0, "The C parser does not support -dy, option ignored");
+       break;
+      case clk_objc:
+       warning(0,
+               "The Objective-C parser does not support -dy, option ignored");
+       break;
+      case clk_cxx:
+       warning(0, "The C++ parser does not support -dy, option ignored");
+       break;
+      case clk_objcxx:
+       warning(0,
+           "The Objective-C++ parser does not support -dy, option ignored");
+       break;
+      default:
+       gcc_unreachable ();
+    }

 
   i = 0;
   for (;;)
     {
 
   i = 0;
   for (;;)
     {

+      /* Start the main input file, if the debug writer wants it. */
+      if (debug_hooks->start_end_main_source_file)
+       (*debug_hooks->start_source_file) (0, this_input_filename);

       finish_options ();
       pch_init ();
       push_file_scope ();
       c_parse_file ();
       finish_file ();
       pop_file_scope ();
       finish_options ();
       pch_init ();
       push_file_scope ();
       c_parse_file ();
       finish_file ();
       pop_file_scope ();

-
+      /* And end the main input file, if the debug writer wants it  */
+      if (debug_hooks->start_end_main_source_file)
+       (*debug_hooks->end_source_file) (0);

       if (++i >= num_in_fnames)
        break;
       cpp_undef_all (parse_in);
       if (++i >= num_in_fnames)
        break;
       cpp_undef_all (parse_in);

+      cpp_clear_file_cache (parse_in);

       this_input_filename
        = cpp_read_main_file (parse_in, in_fnames[i]);
       /* If an input file is missing, abandon further compilation.
       this_input_filename
        = cpp_read_main_file (parse_in, in_fnames[i]);
       /* If an input file is missing, abandon further compilation.

-         cpplib has issued a diagnostic.  */
+        cpplib has issued a diagnostic.  */

       if (!this_input_filename)
        break;
     }
       if (!this_input_filename)
        break;
     }


@@ -1172,6 +1332,7 @@ check_deps_environment_vars (void)
        deps_file = spec;
 
       deps_append = 1;
        deps_file = spec;
 
       deps_append = 1;

+      deps_seen = true;

     }
 }
 
     }
 }
 


@@ -1214,14 +1375,23 @@ sanitize_cpp_opts (void)
   if (flag_dump_macros == 'M')
     flag_no_output = 1;
 
   if (flag_dump_macros == 'M')
     flag_no_output = 1;
 

+  /* By default, -fdirectives-only implies -dD.  This allows subsequent phases
+     to perform proper macro expansion.  */
+  if (cpp_opts->directives_only && !cpp_opts->preprocessed && !flag_dump_macros)
+    flag_dump_macros = 'D';
+

   /* Disable -dD, -dN and -dI if normal output is suppressed.  Allow
      -dM since at least glibc relies on -M -dM to work.  */
   /* Disable -dD, -dN and -dI if normal output is suppressed.  Allow
      -dM since at least glibc relies on -M -dM to work.  */

+  /* Also, flag_no_output implies flag_no_line_commands, always.  */

   if (flag_no_output)
     {
       if (flag_dump_macros != 'M')
        flag_dump_macros = 0;
       flag_dump_includes = 0;
   if (flag_no_output)
     {
       if (flag_dump_macros != 'M')
        flag_dump_macros = 0;
       flag_dump_includes = 0;

+      flag_no_line_commands = 1;

     }
     }

+  else if (cpp_opts->deps.missing_files)
+    error ("-MG may only be used with -M or -MM");

 
   cpp_opts->unsigned_char = !flag_signed_char;
   cpp_opts->stdc_0_in_system_headers = STDC_0_IN_SYSTEM_HEADERS;
 
   cpp_opts->unsigned_char = !flag_signed_char;
   cpp_opts->stdc_0_in_system_headers = STDC_0_IN_SYSTEM_HEADERS;


@@ -1229,7 +1399,11 @@ sanitize_cpp_opts (void)
   /* We want -Wno-long-long to override -pedantic -std=non-c99
      and/or -Wtraditional, whatever the ordering.  */
   cpp_opts->warn_long_long
   /* We want -Wno-long-long to override -pedantic -std=non-c99
      and/or -Wtraditional, whatever the ordering.  */
   cpp_opts->warn_long_long

-    = warn_long_long && ((!flag_isoc99 && pedantic) || warn_traditional);
+    = warn_long_long && ((pedantic
+                         && (c_dialect_cxx ()
+                             ? cxx_dialect == cxx98
+                             : !flag_isoc99))
+                         || warn_traditional);

 
   /* Similarly with -Wno-variadic-macros.  No check for c99 here, since
      this also turns off warnings about GCCs extension.  */
 
   /* Similarly with -Wno-variadic-macros.  No check for c99 here, since
      this also turns off warnings about GCCs extension.  */


@@ -1242,6 +1416,14 @@ sanitize_cpp_opts (void)
      actually output the current directory?  */
   if (flag_working_directory == -1)
     flag_working_directory = (debug_info_level != DINFO_LEVEL_NONE);
      actually output the current directory?  */
   if (flag_working_directory == -1)
     flag_working_directory = (debug_info_level != DINFO_LEVEL_NONE);

+
+  if (cpp_opts->directives_only)
+    {
+      if (warn_unused_macros)
+       error ("-fdirectives-only is incompatible with -Wunused_macros");
+      if (cpp_opts->traditional)
+       error ("-fdirectives-only is incompatible with -traditional");
+    }

 }
 
 /* Add include path with a prefix at the front of its name.  */
 }
 
 /* Add include path with a prefix at the front of its name.  */


@@ -1256,7 +1438,7 @@ add_prefixed_path (const char *suffix, size_t chain)
   prefix     = iprefix ? iprefix : cpp_GCC_INCLUDE_DIR;
   prefix_len = iprefix ? strlen (iprefix) : cpp_GCC_INCLUDE_DIR_len;
 
   prefix     = iprefix ? iprefix : cpp_GCC_INCLUDE_DIR;
   prefix_len = iprefix ? strlen (iprefix) : cpp_GCC_INCLUDE_DIR_len;
 

-  path = xmalloc (prefix_len + suffix_len + 1);
+  path = (char *) xmalloc (prefix_len + suffix_len + 1);

   memcpy (path, prefix, prefix_len);
   memcpy (path + prefix_len, suffix, suffix_len);
   path[prefix_len + suffix_len] = '\0';
   memcpy (path, prefix, prefix_len);
   memcpy (path + prefix_len, suffix, suffix_len);
   path[prefix_len + suffix_len] = '\0';


@@ -1272,7 +1454,10 @@ finish_options (void)
     {
       size_t i;
 
     {
       size_t i;
 

-      cpp_change_file (parse_in, LC_RENAME, _("<built-in>"));
+      cb_file_change (parse_in,
+                     linemap_add (line_table, LC_RENAME, 0,
+                                  _("<built-in>"), 0));
+

       cpp_init_builtins (parse_in, flag_hosted);
       c_cpp_builtins (parse_in);
 
       cpp_init_builtins (parse_in, flag_hosted);
       c_cpp_builtins (parse_in);
 


@@ -1287,7 +1472,10 @@ finish_options (void)
         their acceptance on the -std= setting.  */
       cpp_opts->warn_dollars = (cpp_opts->pedantic && !cpp_opts->c99);
 
         their acceptance on the -std= setting.  */
       cpp_opts->warn_dollars = (cpp_opts->pedantic && !cpp_opts->c99);
 

-      cpp_change_file (parse_in, LC_RENAME, _("<command line>"));
+      cb_file_change (parse_in,
+                     linemap_add (line_table, LC_RENAME, 0,
+                                  _("<command-line>"), 0));
+

       for (i = 0; i < deferred_count; i++)
        {
          struct deferred_opt *opt = &deferred_opts[i];
       for (i = 0; i < deferred_count; i++)
        {
          struct deferred_opt *opt = &deferred_opts[i];


@@ -1319,6 +1507,8 @@ finish_options (void)
            }
        }
     }
            }
        }
     }

+  else if (cpp_opts->directives_only)
+    cpp_init_special_builtins (parse_in);

 
   include_cursor = 0;
   push_command_line_include ();
 
   include_cursor = 0;
   push_command_line_include ();


@@ -1332,7 +1522,7 @@ push_command_line_include (void)
     {
       struct deferred_opt *opt = &deferred_opts[include_cursor++];
 
     {
       struct deferred_opt *opt = &deferred_opts[include_cursor++];
 

-      if (! cpp_opts->preprocessed && opt->code == OPT_include
+      if (!cpp_opts->preprocessed && opt->code == OPT_include

          && cpp_push_include (parse_in, opt->arg))
        return;
     }
          && cpp_push_include (parse_in, opt->arg))
        return;
     }


@@ -1343,12 +1533,12 @@ push_command_line_include (void)
       /* -Wunused-macros should only warn about macros defined hereafter.  */
       cpp_opts->warn_unused_macros = warn_unused_macros;
       /* Restore the line map from <command line>.  */
       /* -Wunused-macros should only warn about macros defined hereafter.  */
       cpp_opts->warn_unused_macros = warn_unused_macros;
       /* Restore the line map from <command line>.  */

-      if (! cpp_opts->preprocessed)
-       cpp_change_file (parse_in, LC_RENAME, main_input_filename);
+      if (!cpp_opts->preprocessed)
+       cpp_change_file (parse_in, LC_RENAME, this_input_filename);

 
       /* Set this here so the client can change the option if it wishes,
         and after stacking the main file so we don't trace the main file.  */
 
       /* Set this here so the client can change the option if it wishes,
         and after stacking the main file so we don't trace the main file.  */

-      line_table.trace_includes = cpp_opts->print_include_names;
+      line_table->trace_includes = cpp_opts->print_include_names;

     }
 }
 
     }
 }
 


@@ -1369,8 +1559,8 @@ cb_file_change (cpp_reader * ARG_UNUSED (pfile),
 void
 cb_dir_change (cpp_reader * ARG_UNUSED (pfile), const char *dir)
 {
 void
 cb_dir_change (cpp_reader * ARG_UNUSED (pfile), const char *dir)
 {

-  if (! set_src_pwd (dir))
-    warning ("too late for # directive to set debug directory");
+  if (!set_src_pwd (dir))
+    warning (0, "too late for # directive to set debug directory");

 }
 
 /* Set the C 89 standard (with 1994 amendments if C94, without GNU
 }
 
 /* Set the C 89 standard (with 1994 amendments if C94, without GNU


@@ -1407,6 +1597,18 @@ set_std_cxx98 (int iso)
   flag_no_gnu_keywords = iso;
   flag_no_nonansi_builtin = iso;
   flag_iso = iso;
   flag_no_gnu_keywords = iso;
   flag_no_nonansi_builtin = iso;
   flag_iso = iso;

+  cxx_dialect = cxx98;
+}
+
+/* Set the C++ 0x working draft "standard" (without GNU extensions if ISO).  */
+static void
+set_std_cxx0x (int iso)
+{
+  cpp_set_lang (parse_in, iso ? CLK_CXX0X: CLK_GNUCXX0X);
+  flag_no_gnu_keywords = iso;
+  flag_no_nonansi_builtin = iso;
+  flag_iso = iso;
+  cxx_dialect = cxx0x;

 }
 
 /* Handle setting implicit to ON.  */
 }
 
 /* Handle setting implicit to ON.  */


@@ -1415,13 +1617,7 @@ set_Wimplicit (int on)
 {
   warn_implicit = on;
   warn_implicit_int = on;
 {
   warn_implicit = on;
   warn_implicit_int = on;

-  if (on)
-    {
-      if (mesg_implicit_function_declaration != 2)
-       mesg_implicit_function_declaration = 1;
-    }
-  else
-    mesg_implicit_function_declaration = 0;
+  warn_implicit_function_declaration = on;

 }
 
 /* Args to -d specify what to dump.  Silently ignore
 }
 
 /* Args to -d specify what to dump.  Silently ignore


@@ -1437,6 +1633,7 @@ handle_OPT_d (const char *arg)
       case 'M':                        /* Dump macros only.  */
       case 'N':                        /* Dump names.  */
       case 'D':                        /* Dump definitions.  */
       case 'M':                        /* Dump macros only.  */
       case 'N':                        /* Dump names.  */
       case 'D':                        /* Dump definitions.  */

+      case 'U':                        /* Dump used macros.  */

        flag_dump_macros = c;
        break;
 
        flag_dump_macros = c;
        break;