2007-09-07 Tobias Burnus <burnus@net-b.de>

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

diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 76ad827..80c01a0 100644 (file)
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -7,7 +7,7 @@ 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
 
 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


@@ -16,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, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, 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"


@@ -39,6 +38,8 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "opts.h"
 #include "options.h"
 #include "mkdeps.h"
 #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


@@ -72,7 +73,7 @@ static bool deps_seen;
 static bool verbose;
 
 /* If -lang-fortran seen.  */
 static bool verbose;
 
 /* If -lang-fortran seen.  */

-static bool lang_fortran = false;
+bool lang_fortran = false;

 
 /* Dependency output file.  */
 static const char *deps_file;
 
 /* Dependency output file.  */
 static const char *deps_file;


@@ -217,7 +218,7 @@ c_common_init_options (unsigned int argc, const char **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;


@@ -231,6 +232,9 @@ c_common_init_options (unsigned int argc, const char **argv)
   warn_pointer_arith = c_dialect_cxx ();
   warn_write_strings = c_dialect_cxx();
 
   warn_pointer_arith = c_dialect_cxx ();
   warn_write_strings = c_dialect_cxx();
 

+  /* 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];
   deferred_opts = XNEWVEC (struct deferred_opt, argc);
 
   result = lang_flags[c_language];


@@ -278,7 +282,12 @@ 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))
     {
     default:
       if (cl_options[code].flags & (CL_C | CL_CXX | CL_ObjC | CL_ObjCXX))

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

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


@@ -394,10 +403,9 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       if (c_dialect_cxx ())
        warn_sign_compare = value;
       warn_switch = value;
       if (c_dialect_cxx ())
        warn_sign_compare = value;
       warn_switch = value;

-      warn_strict_aliasing = value;
+      set_Wstrict_aliasing (value);
+      warn_address = value;

       warn_strict_overflow = value;
       warn_strict_overflow = value;

-      warn_string_literal_comparison = value;
-      warn_always_true = value;

       warn_array_bounds = value;
 
       /* Only warn about unknown pragmas that are not in system
       warn_array_bounds = value;
 
       /* Only warn about unknown pragmas that are not in system


@@ -611,6 +619,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;


@@ -827,6 +839,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;


@@ -1024,6 +1048,13 @@ c_common_post_options (const char **pfilename)
   if (flag_inline_functions)
     flag_inline_trees = 2;
 
   if (flag_inline_functions)
     flag_inline_trees = 2;
 

+  /* 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");
+

   /* If we are given more than one input file, we must use
      unit-at-a-time mode.  */
   if (num_in_fnames > 1)
   /* If we are given more than one input file, we must use
      unit-at-a-time mode.  */
   if (num_in_fnames > 1)


@@ -1035,10 +1066,13 @@ 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 -Wclobbered, -Wempty-body, -Wsign-compare, 
+  /* -Wextra implies -Wtype-limits, -Wclobbered, 
+     -Wempty-body, -Wsign-compare, 

      -Wmissing-field-initializers, -Wmissing-parameter-type
      -Wold-style-declaration, and -Woverride-init, 
      but not if explicitly overridden.  */
      -Wmissing-field-initializers, -Wmissing-parameter-type
      -Wold-style-declaration, and -Woverride-init, 
      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)
   if (warn_clobbered == -1)
     warn_clobbered = extra_warnings;
   if (warn_empty_body == -1)


@@ -1065,6 +1099,30 @@ c_common_post_options (const char **pfilename)
   if (warn_overlength_strings == -1 || c_dialect_cxx ())
     warn_overlength_strings = 0;
 
   if (warn_overlength_strings == -1 || c_dialect_cxx ())
     warn_overlength_strings = 0;
 

+  /* Adjust various flags for C++ based on command-line settings.  */
+  if (c_dialect_cxx ())
+    {
+      if (!flag_permissive)
+       {
+         flag_pedantic_errors = 1;
+         cpp_opts->pedantic_errors = 1;
+       }
+      if (!flag_no_inline)
+       {
+         flag_inline_trees = 1;
+         flag_no_inline = 1;
+       }
+      if (flag_inline_functions)
+       flag_inline_trees = 2;
+    } 
+
+  /* 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.  */
   if (!warn_format)
   /* Special format checking options don't work without -Wformat; warn if
      they are used.  */
   if (!warn_format)


@@ -1077,6 +1135,8 @@ c_common_post_options (const char **pfilename)
               "-Wformat-zero-length ignored without -Wformat");
       warning (OPT_Wformat_nonliteral,
               "-Wformat-nonliteral ignored without -Wformat");
               "-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");
     }
       warning (OPT_Wformat_security,
               "-Wformat-security ignored without -Wformat");
     }


@@ -1085,14 +1145,9 @@ c_common_post_options (const char **pfilename)
   if (warn_implicit_function_declaration == -1) 
     warn_implicit_function_declaration = flag_isoc99;
 
   if (warn_implicit_function_declaration == -1) 
     warn_implicit_function_declaration = flag_isoc99;
 

-  /* C99 requires special handling of complex multiplication and division;
-     -ffast-math and -fcx-limited-range are handled in process_options.  */
-  if (flag_isoc99)
-    flag_complex_method = 2;
-

   /* If we're allowing C++0x constructs, don't warn about C++0x
      compatibility problems.  */
   /* If we're allowing C++0x constructs, don't warn about C++0x
      compatibility problems.  */

-  if (flag_cpp0x)
+  if (cxx_dialect == cxx0x)

     warn_cxx0x_compat = 0;
 
   if (flag_preprocess_only)
     warn_cxx0x_compat = 0;
 
   if (flag_preprocess_only)


@@ -1356,6 +1411,11 @@ 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.  */
   /* Also, flag_no_output implies flag_no_line_commands, always.  */
   /* 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.  */


@@ -1386,6 +1446,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.  */


@@ -1417,7 +1485,7 @@ finish_options (void)
       size_t i;
 
       cb_file_change (parse_in,
       size_t i;
 
       cb_file_change (parse_in,

-                     linemap_add (&line_table, LC_RENAME, 0,
+                     linemap_add (line_table, LC_RENAME, 0,

                                   _("<built-in>"), 0));
 
       cpp_init_builtins (parse_in, flag_hosted);
                                   _("<built-in>"), 0));
 
       cpp_init_builtins (parse_in, flag_hosted);


@@ -1435,7 +1503,7 @@ finish_options (void)
       cpp_opts->warn_dollars = (cpp_opts->pedantic && !cpp_opts->c99);
 
       cb_file_change (parse_in,
       cpp_opts->warn_dollars = (cpp_opts->pedantic && !cpp_opts->c99);
 
       cb_file_change (parse_in,

-                     linemap_add (&line_table, LC_RENAME, 0,
+                     linemap_add (line_table, LC_RENAME, 0,

                                   _("<command-line>"), 0));
 
       for (i = 0; i < deferred_count; i++)
                                   _("<command-line>"), 0));
 
       for (i = 0; i < deferred_count; i++)


@@ -1469,6 +1537,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 ();


@@ -1498,7 +1568,7 @@ push_command_line_include (void)
 
       /* 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;

     }
 }
 
     }
 }
 


@@ -1557,6 +1627,7 @@ 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).  */
 }
 
 /* Set the C++ 0x working draft "standard" (without GNU extensions if ISO).  */


@@ -1567,7 +1638,7 @@ set_std_cxx0x (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;

-  flag_cpp0x = 1;
+  cxx_dialect = cxx0x;

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