X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fc-opts.c;h=a637ffc70c5cb9ff3aa387c9031913b4494159f6;hb=5efd9b45c3936d9707b975a0a3145a9e1aa8faeb;hp=dcb68a16ffffd1dea10c1b26109c92f00942a175;hpb=8e332e0eb157067efd0e3df6ac871742da1f077a;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/c-opts.c b/gcc/c-opts.c index dcb68a16fff..a637ffc70c5 100644 --- a/gcc/c-opts.c +++ b/gcc/c-opts.c @@ -1,12 +1,13 @@ /* C/ObjC/C++ command line option handling. - Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 + 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 -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 @@ -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 -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 +. */ #include "config.h" #include "system.h" @@ -38,6 +38,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA #include "opts.h" #include "options.h" #include "mkdeps.h" +#include "target.h" #ifndef DOLLARS_IN_IDENTIFIERS # define DOLLARS_IN_IDENTIFIERS true @@ -71,7 +72,7 @@ static bool deps_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; @@ -230,6 +231,9 @@ c_common_init_options (unsigned int argc, const char **argv) 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]; @@ -277,7 +281,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)) - 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; @@ -393,9 +402,10 @@ c_common_handle_option (size_t scode, const char *arg, int value) if (c_dialect_cxx ()) warn_sign_compare = value; warn_switch = value; - warn_strict_aliasing = value; - warn_string_literal_comparison = value; - warn_always_true = value; + set_Wstrict_aliasing (value); + warn_address = value; + warn_strict_overflow = value; + warn_array_bounds = value; /* Only warn about unknown pragmas that are not in system headers. */ @@ -416,6 +426,7 @@ c_common_handle_option (size_t scode, const char *arg, int value) /* C++-specific warnings. */ warn_reorder = value; warn_nontemplate_friend = value; + warn_cxx0x_compat = value; if (value > 0) warn_write_strings = true; } @@ -447,8 +458,10 @@ c_common_handle_option (size_t scode, const char *arg, int value) global_dc->warning_as_error_requested = value; 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: @@ -605,6 +618,10 @@ c_common_handle_option (size_t scode, const char *arg, int value) disable_builtin_function (arg); break; + case OPT_fdirectives_only: + cpp_opts->directives_only = 1; + break; + case OPT_fdollars_in_identifiers: cpp_opts->dollars_in_ident = value; break; @@ -705,6 +722,10 @@ c_common_handle_option (size_t scode, const char *arg, int value) 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; @@ -817,6 +838,18 @@ c_common_handle_option (size_t scode, const char *arg, int value) 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; @@ -1014,6 +1047,13 @@ c_common_post_options (const char **pfilename) 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) @@ -1025,12 +1065,25 @@ c_common_post_options (const char **pfilename) if (flag_objc_exceptions && !flag_objc_sjlj_exceptions) flag_exceptions = 1; - /* -Wextra implies -Wsign-compare, -Wmissing-field-initializers and - -Woverride-init, but not if explicitly overridden. */ + /* -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. */ + 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_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; @@ -1045,6 +1098,30 @@ c_common_post_options (const char **pfilename) 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) @@ -1057,14 +1134,20 @@ c_common_post_options (const char **pfilename) "-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"); } - /* 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; + /* -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) { @@ -1327,6 +1410,11 @@ sanitize_cpp_opts (void) 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. */ @@ -1357,6 +1445,14 @@ sanitize_cpp_opts (void) 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. */ @@ -1440,6 +1536,8 @@ finish_options (void) } } } + else if (cpp_opts->directives_only) + cpp_init_special_builtins (parse_in); include_cursor = 0; push_command_line_include (); @@ -1528,6 +1626,7 @@ set_std_cxx98 (int 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). */ @@ -1538,7 +1637,7 @@ set_std_cxx0x (int 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. */ @@ -1547,13 +1646,7 @@ set_Wimplicit (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