/* Parse and display command line options.
Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
- 2009, 2010
+ 2009, 2010, 2011
Free Software Foundation, Inc.
Contributed by Andy Vaught
{
gfc_option.allow_std = GFC_STD_F95_OBS | GFC_STD_F95_DEL
| GFC_STD_F2003 | GFC_STD_F2008 | GFC_STD_F95 | GFC_STD_F77
- | GFC_STD_F2008_OBS | GFC_STD_GNU | GFC_STD_LEGACY;
+ | GFC_STD_F2008_OBS | GFC_STD_F2008_TR | GFC_STD_GNU | GFC_STD_LEGACY;
gfc_option.warn_std = GFC_STD_F95_DEL | GFC_STD_LEGACY;
}
return CL_Fortran;
}
+/* Initialize options structure OPTS. */
+
+void
+gfc_init_options_struct (struct gcc_options *opts)
+{
+ opts->x_flag_errno_math = 0;
+ opts->x_flag_associative_math = -1;
+}
/* Get ready for options handling. Keep in sync with
libgfortran/runtime/compile_options.c (init_compile_options). */
gfc_option.flag_max_array_constructor = 65535;
gfc_option.convert = GFC_CONVERT_NATIVE;
gfc_option.record_marker = 0;
- gfc_option.dump_parse_tree = 0;
+ gfc_option.dump_fortran_original = 0;
+ gfc_option.dump_fortran_optimized = 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.gfc_warn_conversion = 0;
gfc_option.warn_conversion_extra = 0;
+ gfc_option.warn_function_elimination = 0;
gfc_option.warn_implicit_interface = 0;
gfc_option.warn_line_truncation = 0;
gfc_option.warn_surprising = 0;
gfc_option.warn_intrinsic_shadow = 0;
gfc_option.warn_intrinsics_std = 0;
gfc_option.warn_align_commons = 1;
+ gfc_option.warn_real_q_constant = 0;
gfc_option.warn_unused_dummy_argument = 0;
gfc_option.max_errors = 25;
/* Default value of flag_max_stack_var_size is set in gfc_post_options. */
gfc_option.flag_max_stack_var_size = -2;
+ gfc_option.flag_stack_arrays = 0;
gfc_option.flag_range_check = 1;
gfc_option.flag_pack_derived = 0;
gfc_option.flag_automatic = 1;
gfc_option.flag_backslash = 0;
gfc_option.flag_module_private = 0;
- gfc_option.flag_backtrace = 0;
+ gfc_option.flag_backtrace = 1;
gfc_option.flag_allow_leading_underscore = 0;
- gfc_option.flag_dump_core = 0;
gfc_option.flag_external_blas = 0;
gfc_option.blas_matmul_limit = 30;
gfc_option.flag_cray_pointer = 0;
gfc_option.flag_d_lines = -1;
- gfc_option.flag_openmp = 0;
+ gfc_option.gfc_flag_openmp = 0;
gfc_option.flag_sign_zero = 1;
gfc_option.flag_recursive = 0;
gfc_option.flag_init_integer = GFC_INIT_INTEGER_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.flag_protect_parens = -1;
+ gfc_option.flag_realloc_lhs = -1;
+ gfc_option.flag_aggressive_function_elimination = 0;
+ gfc_option.flag_frontend_optimize = -1;
gfc_option.fpe = 0;
gfc_option.rtcheck = 0;
gfc_option.coarray = GFC_FCOARRAY_NONE;
- flag_errno_math = 0;
- flag_associative_math = -1;
-
set_default_std_flags ();
- /* -fshort-enums can be default on some targets. */
- flag_short_enums = targetm.default_short_enums ();
-
/* Initialize cpp-related options. */
gfc_cpp_init_options (decoded_options_count, decoded_options);
}
gfc_option.flag_whole_file = 1;
/* Enable whole-file mode if LTO is in effect. */
- if (flag_lto || flag_whopr)
+ if (flag_lto)
gfc_option.flag_whole_file = 1;
/* Fortran allows associative math - but we cannot reassociate if
if (flag_associative_math == -1)
flag_associative_math = (!flag_trapping_math && !flag_signed_zeros);
+ if (gfc_option.flag_protect_parens == -1)
+ gfc_option.flag_protect_parens = !optimize_fast;
+
+ /* By default, disable (re)allocation during assignment for -std=f95,
+ and enable it for F2003/F2008/GNU/Legacy. */
+ if (gfc_option.flag_realloc_lhs == -1)
+ {
+ if (gfc_option.allow_std & GFC_STD_F2003)
+ gfc_option.flag_realloc_lhs = 1;
+ else
+ gfc_option.flag_realloc_lhs = 0;
+ }
+
/* -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;
+ gfc_option.dump_fortran_original = 0;
+
+ /* Make -fmax-errors visible to gfortran's diagnostic machinery. */
+ if (global_options_set.x_flag_max_errors)
+ gfc_option.max_errors = flag_max_errors;
/* Verify the input file name. */
if (!filename || strcmp (filename, "-") == 0)
gfc_add_include_path (".", true, true);
if (canon_source_file != gfc_source_file)
- gfc_free (CONST_CAST (char *, canon_source_file));
+ free (CONST_CAST (char *, canon_source_file));
/* Decide which form the file will be read in as. */
gfc_option.flag_max_stack_var_size);
else if (!gfc_option.flag_automatic && gfc_option.flag_recursive)
gfc_warning_now ("Flag -fno-automatic overwrites -frecursive");
- else if (!gfc_option.flag_automatic && gfc_option.flag_openmp)
+ else if (!gfc_option.flag_automatic && gfc_option.gfc_flag_openmp)
gfc_warning_now ("Flag -fno-automatic overwrites -frecursive implied by "
"-fopenmp");
else if (gfc_option.flag_max_stack_var_size != -2
gfc_warning_now ("Flag -frecursive overwrites -fmax-stack-var-size=%d",
gfc_option.flag_max_stack_var_size);
else if (gfc_option.flag_max_stack_var_size != -2
- && gfc_option.flag_openmp)
+ && gfc_option.gfc_flag_openmp)
gfc_warning_now ("Flag -fmax-stack-var-size=%d overwrites -frecursive "
"implied by -fopenmp",
gfc_option.flag_max_stack_var_size);
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
+ if (gfc_option.flag_max_stack_var_size == -2 && gfc_option.gfc_flag_openmp
&& gfc_option.flag_automatic)
{
gfc_option.flag_recursive = 1;
if (pedantic && gfc_option.flag_whole_file)
gfc_option.flag_whole_file = 2;
+ /* Optimization implies front end optimization, unless the user
+ specified it directly. */
+
+ if (gfc_option.flag_frontend_optimize == -1)
+ gfc_option.flag_frontend_optimize = optimize;
+
gfc_cpp_post_options ();
/* FIXME: return gfc_cpp_preprocess_only ();
{
gfc_option.warn_aliasing = setting;
gfc_option.warn_ampersand = setting;
- gfc_option.warn_conversion = setting;
+ gfc_option.gfc_warn_conversion = setting;
gfc_option.warn_line_truncation = setting;
gfc_option.warn_surprising = setting;
gfc_option.warn_tabs = !setting;
gfc_option.warn_intrinsic_shadow = setting;
gfc_option.warn_intrinsics_std = setting;
gfc_option.warn_character_truncation = setting;
+ gfc_option.warn_real_q_constant = setting;
gfc_option.warn_unused_dummy_argument = setting;
warn_unused = setting;
warn_return_type = setting;
warn_switch = setting;
warn_uninitialized = setting;
+ warn_maybe_uninitialized = setting;
}
if (gfc_option.module_dir != NULL)
gfc_fatal_error ("gfortran: Only one -J option allowed");
- gfc_option.module_dir = (char *) gfc_getmem (strlen (arg) + 2);
+ gfc_option.module_dir = XCNEWVEC (char, strlen (arg) + 2);
strcpy (gfc_option.module_dir, arg);
- strcat (gfc_option.module_dir, "/");
gfc_add_include_path (gfc_option.module_dir, true, false);
+
+ strcat (gfc_option.module_dir, "/");
}
gfc_option.coarray = GFC_FCOARRAY_NONE;
else if (strcmp (arg, "single") == 0)
gfc_option.coarray = GFC_FCOARRAY_SINGLE;
+ else if (strcmp (arg, "lib") == 0)
+ gfc_option.coarray = GFC_FCOARRAY_LIB;
else
gfc_fatal_error ("Argument to -fcoarray is not valid: %s", arg);
}
bool
gfc_handle_option (size_t scode, const char *arg, int value,
- int kind ATTRIBUTE_UNUSED,
+ int kind ATTRIBUTE_UNUSED, location_t loc ATTRIBUTE_UNUSED,
const struct cl_option_handlers *handlers ATTRIBUTE_UNUSED)
{
bool result = true;
break;
case OPT_Wconversion:
- gfc_option.warn_conversion = value;
+ gfc_option.gfc_warn_conversion = value;
break;
case OPT_Wconversion_extra:
gfc_option.warn_conversion_extra = value;
break;
+ case OPT_Wfunction_elimination:
+ gfc_option.warn_function_elimination = value;
+ break;
+
case OPT_Wimplicit_interface:
gfc_option.warn_implicit_interface = value;
break;
gfc_option.warn_align_commons = value;
break;
+ case OPT_Wreal_q_constant:
+ gfc_option.warn_real_q_constant = value;
+ break;
+
case OPT_Wunused_dummy_argument:
gfc_option.warn_unused_dummy_argument = value;
break;
gfc_option.rtcheck |= GFC_RTCHECK_ARRAY_TEMPS;
break;
- case OPT_fdump_core:
- gfc_option.flag_dump_core = value;
- break;
-
case OPT_fcray_pointer:
gfc_option.flag_cray_pointer = value;
break;
gfc_option.flag_d_lines = 0;
break;
+ case OPT_fdump_fortran_original:
case OPT_fdump_parse_tree:
- gfc_option.dump_parse_tree = value;
+ gfc_option.dump_fortran_original = value;
+ break;
+
+ case OPT_fdump_fortran_optimized:
+ gfc_option.dump_fortran_optimized = value;
break;
case OPT_ffixed_form:
break;
case OPT_fopenmp:
- gfc_option.flag_openmp = value;
+ gfc_option.gfc_flag_openmp = value;
break;
case OPT_ffree_line_length_none:
gfc_option.flag_max_array_constructor = value > 65535 ? value : 65535;
break;
- case OPT_fmax_errors_:
- gfc_option.max_errors = value;
- break;
-
case OPT_fmax_stack_var_size_:
gfc_option.flag_max_stack_var_size = value;
break;
+ case OPT_fstack_arrays:
+ gfc_option.flag_stack_arrays = value;
+ break;
+
case OPT_fmodule_private:
gfc_option.flag_module_private = value;
break;
gfc_option.warn_tabs = 0;
break;
+ case OPT_std_f2008tr:
+ 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_STD_F2008_TR;
+ 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;
+ break;
+
case OPT_std_gnu:
set_default_std_flags ();
break;
gfc_option.flag_align_commons = value;
break;
+ case OPT_faggressive_function_elimination:
+ gfc_option.flag_aggressive_function_elimination = value;
+ break;
+
+ case OPT_ffrontend_optimize:
+ gfc_option.flag_frontend_optimize = value;
+ break;
+
case OPT_fprotect_parens:
gfc_option.flag_protect_parens = value;
break;
+ case OPT_frealloc_lhs:
+ gfc_option.flag_realloc_lhs = value;
+ break;
+
case OPT_fcheck_:
gfc_handle_runtime_check_option (arg);
break;
}
}
- result = (char *) gfc_getmem (len);
+ result = XCNEWVEC (char, len);
pos = 0;
for (j = 1; j < save_decoded_options_count; j++)