X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ffortran%2Foptions.c;h=c49620a24f64169501e1bbdf86d141a2950dbe1c;hb=b78351e5b501a68b78169103678db806cf610607;hp=16e9079f6e652a2913a2a81bc930aba3290c112f;hpb=0e0aee0638bde43342f3d9de402ad8927ba1a449;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c index 16e9079f6e6..c49620a24f6 100644 --- a/gcc/fortran/options.c +++ b/gcc/fortran/options.c @@ -1,5 +1,6 @@ /* Parse and display command line options. - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. Contributed by Andy Vaught @@ -31,50 +32,72 @@ along with GCC; see the file COPYING3. If not see #include "tree-inline.h" #include "gfortran.h" #include "target.h" +#include "cpp.h" +#include "diagnostic-core.h" /* For sorry. */ +#include "tm.h" gfc_option_t gfc_option; /* Set flags that control warnings and errors for different - Fortran standards to their default values. */ + Fortran standards to their default values. Keep in sync with + libgfortran/runtime/compile_options.c (init_compile_options). */ static void set_default_std_flags (void) { gfc_option.allow_std = GFC_STD_F95_OBS | GFC_STD_F95_DEL - | GFC_STD_F2003 | GFC_STD_F95 | GFC_STD_F77 | GFC_STD_GNU - | GFC_STD_LEGACY; + | GFC_STD_F2003 | GFC_STD_F2008 | GFC_STD_F95 | GFC_STD_F77 + | GFC_STD_F2008_OBS | GFC_STD_GNU | GFC_STD_LEGACY; gfc_option.warn_std = GFC_STD_F95_DEL | GFC_STD_LEGACY; } -/* Get ready for options handling. */ + +/* Return language mask for Fortran options. */ unsigned int -gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED, - const char **argv ATTRIBUTE_UNUSED) +gfc_option_lang_mask (void) +{ + return CL_Fortran; +} + + +/* Get ready for options handling. Keep in sync with + libgfortran/runtime/compile_options.c (init_compile_options). */ + +void +gfc_init_options (unsigned int decoded_options_count, + struct cl_decoded_option *decoded_options) { gfc_source_file = NULL; gfc_option.module_dir = NULL; gfc_option.source_form = FORM_UNKNOWN; gfc_option.fixed_line_length = 72; gfc_option.free_line_length = 132; - gfc_option.max_continue_fixed = 19; - gfc_option.max_continue_free = 39; + gfc_option.max_continue_fixed = 255; + gfc_option.max_continue_free = 255; gfc_option.max_identifier_length = GFC_MAX_SYMBOL_LEN; gfc_option.max_subrecord_length = 0; + gfc_option.flag_max_array_constructor = 65535; gfc_option.convert = GFC_CONVERT_NATIVE; gfc_option.record_marker = 0; - gfc_option.verbose = 0; + gfc_option.dump_parse_tree = 0; gfc_option.warn_aliasing = 0; gfc_option.warn_ampersand = 0; gfc_option.warn_character_truncation = 0; + gfc_option.warn_array_temp = 0; gfc_option.warn_conversion = 0; + gfc_option.warn_conversion_extra = 0; gfc_option.warn_implicit_interface = 0; gfc_option.warn_line_truncation = 0; gfc_option.warn_surprising = 0; gfc_option.warn_tabs = 1; gfc_option.warn_underflow = 1; + gfc_option.warn_intrinsic_shadow = 0; + gfc_option.warn_intrinsics_std = 0; + gfc_option.warn_align_commons = 1; + gfc_option.warn_unused_dummy_argument = 0; gfc_option.max_errors = 25; gfc_option.flag_all_intrinsics = 0; @@ -83,6 +106,7 @@ gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED, gfc_option.flag_default_real = 0; gfc_option.flag_dollar_ok = 0; gfc_option.flag_underscoring = 1; + gfc_option.flag_whole_file = 1; gfc_option.flag_f2c = 0; gfc_option.flag_second_underscore = -1; gfc_option.flag_implicit_none = 0; @@ -113,22 +137,23 @@ gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED, gfc_option.flag_init_logical = GFC_INIT_LOGICAL_OFF; gfc_option.flag_init_character = GFC_INIT_CHARACTER_OFF; gfc_option.flag_init_character_value = (char)0; + gfc_option.flag_align_commons = 1; + gfc_option.flag_protect_parens = 1; gfc_option.fpe = 0; - - /* Argument pointers cannot point to anything but their argument. */ - flag_argument_noalias = 3; + gfc_option.rtcheck = 0; + gfc_option.coarray = GFC_FCOARRAY_NONE; flag_errno_math = 0; + flag_associative_math = -1; set_default_std_flags (); - gfc_option.warn_nonstd_intrinsics = 0; - /* -fshort-enums can be default on some targets. */ - gfc_option.fshort_enums = targetm.default_short_enums (); + flag_short_enums = targetm.default_short_enums (); - return CL_Fortran; + /* Initialize cpp-related options. */ + gfc_cpp_init_options (decoded_options_count, decoded_options); } @@ -155,6 +180,9 @@ form_from_filename (const char *filename) ".f03", FORM_FREE} , { + ".f08", FORM_FREE} + , + { ".f", FORM_FIXED} , { @@ -214,9 +242,32 @@ gfc_post_options (const char **pfilename) char *source_path; int i; - /* Issue an error if -fwhole-program was used. */ + /* Excess precision other than "fast" requires front-end + support. */ + if (flag_excess_precision_cmdline == EXCESS_PRECISION_STANDARD + && TARGET_FLT_EVAL_METHOD_NON_DEFAULT) + sorry ("-fexcess-precision=standard for Fortran"); + flag_excess_precision_cmdline = EXCESS_PRECISION_FAST; + + /* Whole program needs whole file mode. */ if (flag_whole_program) - gfc_fatal_error ("Option -fwhole-program is not supported for Fortran"); + gfc_option.flag_whole_file = 1; + + /* Enable whole-file mode if LTO is in effect. */ + if (flag_lto || flag_whopr) + gfc_option.flag_whole_file = 1; + + /* Fortran allows associative math - but we cannot reassociate if + we want traps or signed zeros. Cf. also flag_protect_parens. */ + if (flag_associative_math == -1) + flag_associative_math = (!flag_trapping_math && !flag_signed_zeros); + + /* -fbounds-check is equivalent to -fcheck=bounds */ + if (flag_bounds_check) + gfc_option.rtcheck |= GFC_RTCHECK_BOUNDS; + + if (flag_compare_debug) + gfc_option.dump_parse_tree = 0; /* Verify the input file name. */ if (!filename || strcmp (filename, "-") == 0) @@ -248,13 +299,13 @@ gfc_post_options (const char **pfilename) if (i != 0) { - source_path = alloca (i + 1); + source_path = (char *) alloca (i + 1); memcpy (source_path, canon_source_file, i); source_path[i] = 0; - gfc_add_include_path (source_path, true); + gfc_add_include_path (source_path, true, true); } else - gfc_add_include_path (".", true); + gfc_add_include_path (".", true, true); if (canon_source_file != gfc_source_file) gfc_free (CONST_CAST (char *, canon_source_file)); @@ -286,14 +337,6 @@ gfc_post_options (const char **pfilename) gfc_warning_now ("'-fd-lines-as-code' has no effect in free form"); } - flag_inline_trees = 1; - - /* Use tree inlining. */ - if (!flag_no_inline) - flag_no_inline = 1; - if (flag_inline_functions) - flag_inline_trees = 2; - /* If -pedantic, warn about the use of GNU extensions. */ if (pedantic && (gfc_option.allow_std & GFC_STD_GNU) != 0) gfc_option.warn_std |= GFC_STD_GNU; @@ -326,18 +369,22 @@ gfc_post_options (const char **pfilename) "implied by -fopenmp", gfc_option.flag_max_stack_var_size); - /* Implied -frecursive; implemented as -fmax-stack-var-size=-1. */ - if (gfc_option.flag_max_stack_var_size == -2 && gfc_option.flag_openmp) + /* Implement -frecursive as -fmax-stack-var-size=-1. */ + if (gfc_option.flag_recursive) gfc_option.flag_max_stack_var_size = -1; + /* Implied -frecursive; implemented as -fmax-stack-var-size=-1. */ + if (gfc_option.flag_max_stack_var_size == -2 && gfc_option.flag_openmp + && gfc_option.flag_automatic) + { + gfc_option.flag_recursive = 1; + gfc_option.flag_max_stack_var_size = -1; + } + /* Set default. */ if (gfc_option.flag_max_stack_var_size == -2) gfc_option.flag_max_stack_var_size = 32768; - /* Implement -frecursive as -fmax-stack-var-size=-1. */ - if (gfc_option.flag_recursive) - gfc_option.flag_max_stack_var_size = -1; - /* Implement -fno-automatic as -fmax-stack-var-size=0. */ if (!gfc_option.flag_automatic) gfc_option.flag_max_stack_var_size = 0; @@ -348,9 +395,18 @@ gfc_post_options (const char **pfilename) gfc_option.warn_tabs = 0; } - if (gfc_option.flag_all_intrinsics) - gfc_option.warn_nonstd_intrinsics = 0; + if (pedantic && gfc_option.flag_whole_file) + gfc_option.flag_whole_file = 2; + + gfc_cpp_post_options (); +/* FIXME: return gfc_cpp_preprocess_only (); + + The return value of this function indicates whether the + backend needs to be initialized. On -E, we don't need + the backend. However, if we return 'true' here, an + ICE occurs. Initializing the backend doesn't hurt much, + hence, for now we can live with it as is. */ return false; } @@ -362,24 +418,20 @@ set_Wall (int setting) { gfc_option.warn_aliasing = setting; gfc_option.warn_ampersand = setting; + gfc_option.warn_conversion = setting; gfc_option.warn_line_truncation = setting; - gfc_option.warn_nonstd_intrinsics = setting; gfc_option.warn_surprising = setting; gfc_option.warn_tabs = !setting; gfc_option.warn_underflow = setting; + gfc_option.warn_intrinsic_shadow = setting; + gfc_option.warn_intrinsics_std = setting; gfc_option.warn_character_truncation = setting; + gfc_option.warn_unused_dummy_argument = setting; - set_Wunused (setting); + warn_unused = setting; warn_return_type = setting; warn_switch = setting; - - /* We save the value of warn_uninitialized, since if they put - -Wuninitialized on the command line, we need to generate a - warning about not using it without also specifying -O. */ - if (setting == 0) - warn_uninitialized = 0; - else if (warn_uninitialized != 1) - warn_uninitialized = 2; + warn_uninitialized = setting; } @@ -388,22 +440,13 @@ gfc_handle_module_path_options (const char *arg) { if (gfc_option.module_dir != NULL) - { - gfc_status ("gfortran: Only one -M option allowed\n"); - exit (3); - } - - if (arg == NULL) - { - gfc_status ("gfortran: Directory required after -M\n"); - exit (3); - } + gfc_fatal_error ("gfortran: Only one -J option allowed"); gfc_option.module_dir = (char *) gfc_getmem (strlen (arg) + 2); strcpy (gfc_option.module_dir, arg); strcat (gfc_option.module_dir, "/"); - gfc_add_include_path (gfc_option.module_dir, true); + gfc_add_include_path (gfc_option.module_dir, true, false); } @@ -445,23 +488,75 @@ gfc_handle_fpe_trap_option (const char *arg) } +static void +gfc_handle_coarray_option (const char *arg) +{ + if (strcmp (arg, "none") == 0) + gfc_option.coarray = GFC_FCOARRAY_NONE; + else if (strcmp (arg, "single") == 0) + gfc_option.coarray = GFC_FCOARRAY_SINGLE; + else + gfc_fatal_error ("Argument to -fcoarray is not valid: %s", arg); +} + + +static void +gfc_handle_runtime_check_option (const char *arg) +{ + int result, pos = 0, n; + static const char * const optname[] = { "all", "bounds", "array-temps", + "recursion", "do", "pointer", + "mem", NULL }; + static const int optmask[] = { GFC_RTCHECK_ALL, GFC_RTCHECK_BOUNDS, + GFC_RTCHECK_ARRAY_TEMPS, + GFC_RTCHECK_RECURSION, GFC_RTCHECK_DO, + GFC_RTCHECK_POINTER, GFC_RTCHECK_MEM, + 0 }; + + while (*arg) + { + while (*arg == ',') + arg++; + + while (arg[pos] && arg[pos] != ',') + pos++; + + result = 0; + for (n = 0; optname[n] != NULL; n++) + { + if (optname[n] && strncmp (optname[n], arg, pos) == 0) + { + gfc_option.rtcheck |= optmask[n]; + arg += pos; + pos = 0; + result = 1; + break; + } + } + if (!result) + gfc_fatal_error ("Argument to -fcheck is not valid: %s", arg); + } +} + + /* Handle command-line options. Returns 0 if unrecognized, 1 if recognized and handled. */ -int -gfc_handle_option (size_t scode, const char *arg, int value) +bool +gfc_handle_option (size_t scode, const char *arg, int value, + int kind ATTRIBUTE_UNUSED, + const struct cl_option_handlers *handlers ATTRIBUTE_UNUSED) { - int result = 1; + bool result = true; enum opt_code code = (enum opt_code) scode; - /* Ignore file names. */ - if (code == N_OPTS) - return 1; + if (gfc_cpp_handle_option (scode, arg, value) == 1) + return true; switch (code) { default: - result = 0; + result = false; break; case OPT_Wall: @@ -476,6 +571,10 @@ gfc_handle_option (size_t scode, const char *arg, int value) gfc_option.warn_ampersand = value; break; + case OPT_Warray_temporaries: + gfc_option.warn_array_temp = value; + break; + case OPT_Wcharacter_truncation: gfc_option.warn_character_truncation = value; break; @@ -484,14 +583,26 @@ gfc_handle_option (size_t scode, const char *arg, int value) gfc_option.warn_conversion = value; break; + case OPT_Wconversion_extra: + gfc_option.warn_conversion_extra = value; + break; + case OPT_Wimplicit_interface: gfc_option.warn_implicit_interface = value; break; + case OPT_Wimplicit_procedure: + gfc_option.warn_implicit_procedure = value; + break; + case OPT_Wline_truncation: gfc_option.warn_line_truncation = value; break; + case OPT_Wreturn_type: + warn_return_type = value; + break; + case OPT_Wsurprising: gfc_option.warn_surprising = value; break; @@ -504,6 +615,18 @@ gfc_handle_option (size_t scode, const char *arg, int value) gfc_option.warn_underflow = value; break; + case OPT_Wintrinsic_shadow: + gfc_option.warn_intrinsic_shadow = value; + break; + + case OPT_Walign_commons: + gfc_option.warn_align_commons = value; + break; + + case OPT_Wunused_dummy_argument: + gfc_option.warn_unused_dummy_argument = value; + break; + case OPT_fall_intrinsics: gfc_option.flag_all_intrinsics = 1; break; @@ -524,6 +647,10 @@ gfc_handle_option (size_t scode, const char *arg, int value) gfc_option.flag_backtrace = value; break; + case OPT_fcheck_array_temporaries: + gfc_option.rtcheck |= GFC_RTCHECK_ARRAY_TEMPS; + break; + case OPT_fdump_core: gfc_option.flag_dump_core = value; break; @@ -557,7 +684,7 @@ gfc_handle_option (size_t scode, const char *arg, int value) break; case OPT_fdump_parse_tree: - gfc_option.verbose = value; + gfc_option.dump_parse_tree = value; break; case OPT_ffixed_form: @@ -596,6 +723,10 @@ gfc_handle_option (size_t scode, const char *arg, int value) gfc_option.flag_underscoring = value; break; + case OPT_fwhole_file: + gfc_option.flag_whole_file = value; + break; + case OPT_fsecond_underscore: gfc_option.flag_second_underscore = value; break; @@ -612,10 +743,14 @@ gfc_handle_option (size_t scode, const char *arg, int value) break; case OPT_fintrinsic_modules_path: - gfc_add_include_path (arg, false); + gfc_add_include_path (arg, false, false); gfc_add_intrinsic_modules_path (arg); break; + case OPT_fmax_array_constructor_: + gfc_option.flag_max_array_constructor = value > 65535 ? value : 65535; + break; + case OPT_fmax_errors_: gfc_option.max_errors = value; break; @@ -687,6 +822,8 @@ gfc_handle_option (size_t scode, const char *arg, int value) gfc_option.flag_init_real = GFC_INIT_REAL_ZERO; else if (!strcasecmp (arg, "nan")) gfc_option.flag_init_real = GFC_INIT_REAL_NAN; + else if (!strcasecmp (arg, "snan")) + gfc_option.flag_init_real = GFC_INIT_REAL_SNAN; else if (!strcasecmp (arg, "inf")) gfc_option.flag_init_real = GFC_INIT_REAL_INF; else if (!strcasecmp (arg, "-inf")) @@ -694,7 +831,7 @@ gfc_handle_option (size_t scode, const char *arg, int value) else gfc_fatal_error ("Unrecognized option to -finit-real: %s", arg); - break; + break; case OPT_finit_integer_: gfc_option.flag_init_integer = GFC_INIT_INTEGER_ON; @@ -713,25 +850,27 @@ gfc_handle_option (size_t scode, const char *arg, int value) break; case OPT_I: - gfc_add_include_path (arg, true); + gfc_add_include_path (arg, true, false); break; case OPT_J: - case OPT_M: gfc_handle_module_path_options (arg); break; - + case OPT_fsign_zero: gfc_option.flag_sign_zero = value; break; - + case OPT_ffpe_trap_: gfc_handle_fpe_trap_option (arg); break; case OPT_std_f95: - gfc_option.allow_std = GFC_STD_F95_OBS | GFC_STD_F95 | GFC_STD_F77; + gfc_option.allow_std = GFC_STD_F95_OBS | GFC_STD_F95 | GFC_STD_F77 + | GFC_STD_F2008_OBS; gfc_option.warn_std = GFC_STD_F95_OBS; + gfc_option.max_continue_fixed = 19; + gfc_option.max_continue_free = 39; gfc_option.max_identifier_length = 31; gfc_option.warn_ampersand = 1; gfc_option.warn_tabs = 0; @@ -739,10 +878,17 @@ gfc_handle_option (size_t scode, const char *arg, int value) case OPT_std_f2003: gfc_option.allow_std = GFC_STD_F95_OBS | GFC_STD_F77 - | GFC_STD_F2003 | GFC_STD_F95; + | GFC_STD_F2003 | GFC_STD_F95 | GFC_STD_F2008_OBS; gfc_option.warn_std = GFC_STD_F95_OBS; - gfc_option.max_continue_fixed = 255; - gfc_option.max_continue_free = 255; + gfc_option.max_identifier_length = 63; + gfc_option.warn_ampersand = 1; + gfc_option.warn_tabs = 0; + break; + + case OPT_std_f2008: + gfc_option.allow_std = GFC_STD_F95_OBS | GFC_STD_F77 + | GFC_STD_F2003 | GFC_STD_F95 | GFC_STD_F2008 | GFC_STD_F2008_OBS; + gfc_option.warn_std = GFC_STD_F95_OBS | GFC_STD_F2008_OBS; gfc_option.max_identifier_length = 63; gfc_option.warn_ampersand = 1; gfc_option.warn_tabs = 0; @@ -757,12 +903,12 @@ gfc_handle_option (size_t scode, const char *arg, int value) gfc_option.warn_std = 0; break; - case OPT_Wnonstd_intrinsics: - gfc_option.warn_nonstd_intrinsics = value; + case OPT_Wintrinsics_std: + gfc_option.warn_intrinsics_std = value; break; case OPT_fshort_enums: - gfc_option.fshort_enums = 1; + /* Handled in language-independent code. */ break; case OPT_fconvert_little_endian: @@ -798,7 +944,23 @@ gfc_handle_option (size_t scode, const char *arg, int value) break; case OPT_frecursive: - gfc_option.flag_recursive = 1; + gfc_option.flag_recursive = value; + break; + + case OPT_falign_commons: + gfc_option.flag_align_commons = value; + break; + + case OPT_fprotect_parens: + gfc_option.flag_protect_parens = value; + break; + + case OPT_fcheck_: + gfc_handle_runtime_check_option (arg); + break; + + case OPT_fcoarray_: + gfc_handle_coarray_option (arg); break; }