PR/21391

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

diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 575ff4d..c53238b 100644 (file)
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -1,5 +1,5 @@
 /* C/ObjC/C++ command line option handling.
 /* C/ObjC/C++ 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"


@@ -70,12 +70,18 @@ static bool deps_seen;
 /* If -v seen.  */
 static bool verbose;
 
 /* If -v seen.  */
 static bool verbose;
 

+/* If -lang-fortran seen.  */
+static bool lang_fortran = false;
+

 /* Dependency output file.  */
 static const char *deps_file;
 
 /* The prefix given by -iprefix, if any.  */
 static const char *iprefix;
 
 /* Dependency output file.  */
 static const char *deps_file;
 
 /* 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;
 


@@ -219,9 +225,9 @@ c_common_init_options (unsigned int argc, const char **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 = XNEWVEC (struct deferred_opt, argc);
 
 
   deferred_opts = XNEWVEC (struct deferred_opt, argc);
 


@@ -237,6 +243,15 @@ c_common_init_options (unsigned int argc, const char **argv)
            result |= CL_C | CL_ObjC | CL_CXX | CL_ObjCXX;
            break;
          }
            result |= CL_C | CL_ObjC | CL_CXX | CL_ObjCXX;
            break;
          }

+
+#ifdef CL_Fortran
+      for (i = 1; i < argc; i++)
+       if (! strcmp (argv[i], "-lang-fortran"))
+       {
+           result |= CL_Fortran;
+           break;
+       }
+#endif

     }
 
   return result;
     }
 
   return result;


@@ -258,6 +273,10 @@ c_common_handle_option (size_t scode, const char *arg, int value)
     default:
       if (cl_options[code].flags & (CL_C | CL_CXX | CL_ObjC | CL_ObjCXX))
        break;
     default:
       if (cl_options[code].flags & (CL_C | CL_CXX | CL_ObjC | CL_ObjCXX))
        break;

+#ifdef CL_Fortran
+      if (lang_fortran && (cl_options[code].flags & (CL_Fortran)))
+       break;
+#endif

       result = 0;
       break;
 
       result = 0;
       break;
 


@@ -370,6 +389,8 @@ c_common_handle_option (size_t scode, const char *arg, int value)
        warn_sign_compare = value;
       warn_switch = value;
       warn_strict_aliasing = value;
        warn_sign_compare = value;
       warn_switch = value;
       warn_strict_aliasing = value;

+      warn_string_literal_comparison = value;
+      warn_always_true = value;

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


@@ -388,7 +409,6 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       else
        {
          /* C++-specific warnings.  */
       else
        {
          /* C++-specific warnings.  */

-         warn_nonvdtor = value;

          warn_reorder = value;
          warn_nontemplate_friend = value;
        }
          warn_reorder = value;
          warn_nontemplate_friend = value;
        }


@@ -397,6 +417,9 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       cpp_opts->warn_comments = value;
       cpp_opts->warn_num_sign_change = value;
       cpp_opts->warn_multichar = value;        /* Was C++ only.  */
       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_Wcomment:
       break;
 
     case OPT_Wcomment:


@@ -408,10 +431,6 @@ 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_Wendif_labels:
       cpp_opts->warn_endif_labels = value;
       break;


@@ -460,10 +479,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;


@@ -495,10 +531,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:


@@ -537,7 +576,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 %qs 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:


@@ -610,10 +649,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;


@@ -630,11 +665,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:


@@ -650,7 +682,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;
 


@@ -682,14 +714,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;


@@ -762,6 +786,10 @@ 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_fvisibility_inlines_hidden:
       visibility_options.inlines_hidden = value;
       break;


@@ -791,6 +819,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;


@@ -820,6 +852,10 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       cpp_opts->dollars_in_ident = false;
       break;
 
       cpp_opts->dollars_in_ident = false;
       break;
 

+    case OPT_lang_fortran:
+      lang_fortran = true;
+      break;
+

     case OPT_lang_objc:
       cpp_opts->objc = 1;
       break;
     case OPT_lang_objc:
       cpp_opts->objc = 1;
       break;


@@ -848,12 +884,21 @@ 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;

       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_remap:
       cpp_opts->remap = 1;
       break;


@@ -934,9 +979,15 @@ 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);
 

+#ifdef C_COMMON_OVERRIDE_OPTIONS
+  /* Some machines may reject certain combinations of C
+     language-specific options.  */
+  C_COMMON_OVERRIDE_OPTIONS;
+#endif
+

   flag_inline_trees = 1;
 
   /* Use tree inlining.  */
   flag_inline_trees = 1;
 
   /* Use tree inlining.  */


@@ -963,20 +1014,32 @@ c_common_post_options (const char **pfilename)
   if (warn_missing_field_initializers == -1)
     warn_missing_field_initializers = extra_warnings;
 
   if (warn_missing_field_initializers == -1)
     warn_missing_field_initializers = 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;
+
+  /* -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;
+

   /* 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_security,
+              "-Wformat-security ignored without -Wformat");
+    }

 
   /* C99 requires special handling of complex multiplication and division;
      -ffast-math and -fcx-limited-range are handled in process_options.  */
 
   /* C99 requires special handling of complex multiplication and division;
      -ffast-math and -fcx-limited-range are handled in process_options.  */


@@ -1057,6 +1120,9 @@ 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);
+

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


@@ -1083,19 +1149,24 @@ c_common_parse_file (int set_yydebug)
   yydebug = set_yydebug;
 #else
   if (set_yydebug)
   yydebug = set_yydebug;
 #else
   if (set_yydebug)

-    warning ("YYDEBUG was not defined at build time, -dy ignored");
+    warning (0, "YYDEBUG was not defined at build time, -dy ignored");

 #endif
 
   i = 0;
   for (;;)
     {
 #endif
 
   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);


@@ -1226,7 +1297,7 @@ sanitize_cpp_opts (void)
 
   /* 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. */
+  /* Also, flag_no_output implies flag_no_line_commands, always.  */

   if (flag_no_output)
     {
       if (flag_dump_macros != 'M')
   if (flag_no_output)
     {
       if (flag_dump_macros != 'M')


@@ -1284,7 +1355,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);
 


@@ -1382,7 +1456,7 @@ void
 cb_dir_change (cpp_reader * ARG_UNUSED (pfile), const char *dir)
 {
   if (!set_src_pwd (dir))
 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");
+    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