2006-12-23 Manuel Lopez-Ibanez <manu@gcc.gnu.org>

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

diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index b1dcc04..5390a05 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.


@@ -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;
 


@@ -103,6 +109,7 @@ static size_t include_cursor;
 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);


@@ -219,9 +226,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 +244,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;


@@ -253,11 +269,19 @@ 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))
        break;
   switch (code)
     {
     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 +394,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,15 +414,19 @@ 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;

+          if (value > 0)
+            warn_write_strings = true;

        }
 
       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.  */
        }
 
       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_Wcomment:
       break;
 
     case OPT_Wcomment:


@@ -408,10 +438,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;


@@ -512,10 +538,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:


@@ -627,10 +656,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;


@@ -647,11 +672,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:


@@ -726,7 +748,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)


@@ -770,7 +792,11 @@ c_common_handle_option (size_t scode, const char *arg, int value)
     case OPT_fuse_cxa_atexit:
       flag_use_cxa_atexit = value;
       break;
     case OPT_fuse_cxa_atexit:
       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;


@@ -800,6 +826,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;


@@ -829,6 +859,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;


@@ -857,6 +891,10 @@ 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:
       break;
 
     case OPT_print_objc_runtime_info:


@@ -874,29 +912,40 @@ c_common_handle_option (size_t scode, const char *arg, int value)
 
     case OPT_std_c__98:
     case OPT_std_gnu__98:
 
     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:


@@ -948,9 +997,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.  */


@@ -970,12 +1025,32 @@ 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 and -Wmissing-field-initializers,
+  /* -Wextra implies -Wclobbered, -Wempty-body, -Wsign-compare, 
+     -Wmissing-field-initializers, -Wmissing-parameter-type and -Woverride-init, 

      but not if explicitly overridden.  */
      but not if explicitly overridden.  */

+  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_missing_field_initializers == -1)
     warn_missing_field_initializers = 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_override_init == -1)
+    warn_override_init = 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.  */


@@ -991,8 +1066,6 @@ c_common_post_options (const char **pfilename)
               "-Wformat-nonliteral ignored without -Wformat");
       warning (OPT_Wformat_security,
               "-Wformat-security ignored without -Wformat");
               "-Wformat-nonliteral ignored without -Wformat");
       warning (OPT_Wformat_security,
               "-Wformat-security ignored without -Wformat");

-      warning (OPT_Wmissing_format_attribute,
-              "-Wmissing-format-attribute ignored without -Wformat");

     }
 
   /* C99 requires special handling of complex multiplication and division;
     }
 
   /* C99 requires special handling of complex multiplication and division;


@@ -1097,14 +1170,26 @@ 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 (0, "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 (;;)


@@ -1127,7 +1212,7 @@ c_common_parse_file (int set_yydebug)
       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;
     }


@@ -1327,7 +1412,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];


@@ -1449,6 +1537,17 @@ set_std_cxx98 (int iso)
   flag_iso = iso;
 }
 
   flag_iso = iso;
 }
 

+/* 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;
+  flag_cpp0x = 1;
+}
+

 /* Handle setting implicit to ON.  */
 static void
 set_Wimplicit (int on)
 /* Handle setting implicit to ON.  */
 static void
 set_Wimplicit (int on)