X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ffortran%2Foptions.c;h=e653ac92843ca0ec7c16fbbc0f925bbf7e5b618c;hb=2ecc6bc5131880ba6c464152d56fb1a301cc2d4f;hp=6add2b8a3c0c78d912f2e08bfe9f35fe481c571c;hpb=b71883de266504d10ea6357eb4342f4dc682846c;p=pf3gnuchains%2Fgcc-fork.git
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 6add2b8a3c0..e653ac92843 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -1,5 +1,5 @@
/* Parse and display command line options.
- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Free Software Foundation, Inc.
Contributed by Andy Vaught
@@ -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
-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
@@ -16,10 +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"
@@ -29,37 +27,55 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include "intl.h"
#include "opts.h"
#include "options.h"
+#include "params.h"
#include "tree-inline.h"
-
#include "gfortran.h"
#include "target.h"
+#include "cpp.h"
gfc_option_t gfc_option;
+/* Set flags that control warnings and errors for different
+ Fortran standards to their default values. */
+
+static void
+set_default_std_flags (void)
+{
+ 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_GNU | GFC_STD_LEGACY;
+ gfc_option.warn_std = GFC_STD_F95_DEL | GFC_STD_LEGACY;
+}
+
/* Get ready for options handling. */
unsigned int
-gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED,
- const char **argv ATTRIBUTE_UNUSED)
+gfc_init_options (unsigned int argc, const char **argv)
{
gfc_source_file = NULL;
gfc_option.module_dir = NULL;
gfc_option.source_form = FORM_UNKNOWN;
- gfc_option.fixed_line_length = -1;
- gfc_option.free_line_length = -1;
+ gfc_option.fixed_line_length = 72;
+ gfc_option.free_line_length = 132;
+ gfc_option.max_continue_fixed = 255;
+ gfc_option.max_continue_free = 255;
gfc_option.max_identifier_length = GFC_MAX_SYMBOL_LEN;
- gfc_option.verbose = 0;
+ gfc_option.max_subrecord_length = 0;
+ gfc_option.convert = GFC_CONVERT_NATIVE;
+ gfc_option.record_marker = 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_conversion = 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_unused_labels = 0;
+ gfc_option.max_errors = 25;
gfc_option.flag_all_intrinsics = 0;
gfc_option.flag_default_double = 0;
@@ -70,39 +86,51 @@ gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED,
gfc_option.flag_f2c = 0;
gfc_option.flag_second_underscore = -1;
gfc_option.flag_implicit_none = 0;
- gfc_option.flag_max_stack_var_size = 32768;
- gfc_option.flag_module_access_private = 0;
- gfc_option.flag_no_backend = 0;
+
+ /* 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_range_check = 1;
gfc_option.flag_pack_derived = 0;
gfc_option.flag_repack_arrays = 0;
gfc_option.flag_preprocessed = 0;
gfc_option.flag_automatic = 1;
- gfc_option.flag_backslash = 1;
+ gfc_option.flag_backslash = 0;
+ gfc_option.flag_module_private = 0;
+ gfc_option.flag_backtrace = 0;
+ 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.q_kind = gfc_default_double_kind;
-
+ gfc_option.flag_sign_zero = 1;
+ gfc_option.flag_recursive = 0;
+ gfc_option.flag_init_integer = GFC_INIT_INTEGER_OFF;
+ gfc_option.flag_init_integer_value = 0;
+ gfc_option.flag_init_real = GFC_INIT_REAL_OFF;
+ 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.fpe = 0;
- /* Argument pointers cannot point to anything
- but their argument. */
+ /* Argument pointers cannot point to anything but their argument. */
flag_argument_noalias = 3;
flag_errno_math = 0;
- 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_option.warn_std = GFC_STD_F95_OBS | GFC_STD_F95_DEL
- | GFC_STD_LEGACY;
+ 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 ();
+ /* Initialize cpp-related options. */
+ gfc_cpp_init_options(argc, argv);
+
return CL_Fortran;
}
@@ -113,7 +141,6 @@ gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED,
static gfc_source_form
form_from_filename (const char *filename)
{
-
static const struct
{
const char *extension;
@@ -128,12 +155,21 @@ form_from_filename (const char *filename)
".f95", FORM_FREE}
,
{
+ ".f03", FORM_FREE}
+ ,
+ {
+ ".f08", FORM_FREE}
+ ,
+ {
".f", FORM_FIXED}
,
{
".for", FORM_FIXED}
,
{
+ ".ftn", FORM_FIXED}
+ ,
+ {
"", FORM_UNKNOWN}
}; /* sentinel value */
@@ -184,6 +220,10 @@ gfc_post_options (const char **pfilename)
char *source_path;
int i;
+ /* Issue an error if -fwhole-program was used. */
+ if (flag_whole_program)
+ gfc_fatal_error ("Option -fwhole-program is not supported for Fortran");
+
/* Verify the input file name. */
if (!filename || strcmp (filename, "-") == 0)
{
@@ -211,18 +251,19 @@ gfc_post_options (const char **pfilename)
i = strlen (canon_source_file);
while (i > 0 && !IS_DIR_SEPARATOR (canon_source_file[i]))
i--;
+
if (i != 0)
{
source_path = alloca (i + 1);
memcpy (source_path, canon_source_file, i);
source_path[i] = 0;
- gfc_add_include_path (source_path);
+ gfc_add_include_path (source_path, true);
}
else
- gfc_add_include_path (".");
+ gfc_add_include_path (".", true);
if (canon_source_file != gfc_source_file)
- gfc_free ((void *) canon_source_file);
+ gfc_free (CONST_CAST (char *, canon_source_file));
/* Decide which form the file will be read in as. */
@@ -235,7 +276,7 @@ gfc_post_options (const char **pfilename)
if (gfc_current_form == FORM_UNKNOWN)
{
gfc_current_form = FORM_FREE;
- gfc_warning_now ("Reading file '%s' as free form.",
+ gfc_warning_now ("Reading file '%s' as free form",
(filename[0] == '\0') ? "" : filename);
}
}
@@ -246,10 +287,9 @@ gfc_post_options (const char **pfilename)
{
if (gfc_option.flag_d_lines == 0)
gfc_warning_now ("'-fd-lines-as-comments' has no effect "
- "in free form.");
+ "in free form");
else if (gfc_option.flag_d_lines == 1)
- gfc_warning_now ("'-fd-lines-as-code' has no effect "
- "in free form.");
+ gfc_warning_now ("'-fd-lines-as-code' has no effect in free form");
}
flag_inline_trees = 1;
@@ -273,16 +313,59 @@ gfc_post_options (const char **pfilename)
if (gfc_option.flag_second_underscore == -1)
gfc_option.flag_second_underscore = gfc_option.flag_f2c;
+ if (!gfc_option.flag_automatic && gfc_option.flag_max_stack_var_size != -2
+ && gfc_option.flag_max_stack_var_size != 0)
+ gfc_warning_now ("Flag -fno-automatic overwrites -fmax-stack-var-size=%d",
+ 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)
+ gfc_warning_now ("Flag -fno-automatic overwrites -frecursive implied by "
+ "-fopenmp");
+ else if (gfc_option.flag_max_stack_var_size != -2
+ && gfc_option.flag_recursive)
+ 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_warning_now ("Flag -fmax-stack-var-size=%d overwrites -frecursive "
+ "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)
+ 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;
if (pedantic)
- gfc_option.warn_ampersand = 1;
+ {
+ gfc_option.warn_ampersand = 1;
+ gfc_option.warn_tabs = 0;
+ }
if (gfc_option.flag_all_intrinsics)
gfc_option.warn_nonstd_intrinsics = 0;
+ 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;
}
@@ -290,27 +373,27 @@ gfc_post_options (const char **pfilename)
/* Set the options for -Wall. */
static void
-set_Wall (void)
+set_Wall (int setting)
{
-
- gfc_option.warn_aliasing = 1;
- gfc_option.warn_ampersand = 1;
- gfc_option.warn_line_truncation = 1;
- gfc_option.warn_nonstd_intrinsics = 1;
- gfc_option.warn_surprising = 1;
- gfc_option.warn_tabs = 0;
- gfc_option.warn_underflow = 1;
- gfc_option.warn_unused_labels = 1;
-
- set_Wunused (1);
- warn_return_type = 1;
- warn_switch = 1;
+ gfc_option.warn_aliasing = setting;
+ gfc_option.warn_ampersand = 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_character_truncation = setting;
+
+ set_Wunused (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 (warn_uninitialized != 1)
+ if (setting == 0)
+ warn_uninitialized = 0;
+ else if (warn_uninitialized != 1)
warn_uninitialized = 2;
}
@@ -320,28 +403,22 @@ 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);
}
+
static void
gfc_handle_fpe_trap_option (const char *arg)
{
int result, pos = 0, n;
static const char * const exception[] = { "invalid", "denormal", "zero",
- "overflow", "underflow",
+ "overflow", "underflow",
"precision", NULL };
static const int opt_exception[] = { GFC_FPE_INVALID, GFC_FPE_DENORMAL,
GFC_FPE_ZERO, GFC_FPE_OVERFLOW,
@@ -352,8 +429,10 @@ gfc_handle_fpe_trap_option (const char *arg)
{
while (*arg == ',')
arg++;
+
while (arg[pos] && arg[pos] != ',')
pos++;
+
result = 0;
for (n = 0; exception[n] != NULL; n++)
{
@@ -366,13 +445,15 @@ gfc_handle_fpe_trap_option (const char *arg)
break;
}
}
- if (! result)
+ if (!result)
gfc_fatal_error ("Argument to -ffpe-trap 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)
{
@@ -383,6 +464,9 @@ gfc_handle_option (size_t scode, const char *arg, int value)
if (code == N_OPTS)
return 1;
+ if (gfc_cpp_handle_option (scode, arg, value) == 1)
+ return 1;
+
switch (code)
{
default:
@@ -390,7 +474,7 @@ gfc_handle_option (size_t scode, const char *arg, int value)
break;
case OPT_Wall:
- set_Wall ();
+ set_Wall (value);
break;
case OPT_Waliasing:
@@ -401,6 +485,10 @@ gfc_handle_option (size_t scode, const char *arg, int value)
gfc_option.warn_ampersand = value;
break;
+ case OPT_Wcharacter_truncation:
+ gfc_option.warn_character_truncation = value;
+ break;
+
case OPT_Wconversion:
gfc_option.warn_conversion = value;
break;
@@ -413,6 +501,10 @@ gfc_handle_option (size_t scode, const char *arg, int value)
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;
@@ -425,10 +517,6 @@ gfc_handle_option (size_t scode, const char *arg, int value)
gfc_option.warn_underflow = value;
break;
- case OPT_Wunused_labels:
- gfc_option.warn_unused_labels = value;
- break;
-
case OPT_fall_intrinsics:
gfc_option.flag_all_intrinsics = 1;
break;
@@ -437,10 +525,22 @@ gfc_handle_option (size_t scode, const char *arg, int value)
gfc_option.flag_automatic = value;
break;
+ case OPT_fallow_leading_underscore:
+ gfc_option.flag_allow_leading_underscore = value;
+ break;
+
case OPT_fbackslash:
gfc_option.flag_backslash = value;
break;
+ case OPT_fbacktrace:
+ gfc_option.flag_backtrace = value;
+ break;
+
+ case OPT_fdump_core:
+ gfc_option.flag_dump_core = value;
+ break;
+
case OPT_fcray_pointer:
gfc_option.flag_cray_pointer = value;
break;
@@ -453,6 +553,14 @@ gfc_handle_option (size_t scode, const char *arg, int value)
gfc_option.flag_dollar_ok = value;
break;
+ case OPT_fexternal_blas:
+ gfc_option.flag_external_blas = value;
+ break;
+
+ case OPT_fblas_matmul_limit_:
+ gfc_option.blas_matmul_limit = value;
+ break;
+
case OPT_fd_lines_as_code:
gfc_option.flag_d_lines = 1;
break;
@@ -462,7 +570,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:
@@ -492,6 +600,8 @@ gfc_handle_option (size_t scode, const char *arg, int value)
break;
case OPT_ffree_line_length_:
+ if (value != 0 && value < 4)
+ gfc_fatal_error ("Free line length must be at least three.");
gfc_option.free_line_length = value;
break;
@@ -503,20 +613,36 @@ gfc_handle_option (size_t scode, const char *arg, int value)
gfc_option.flag_second_underscore = value;
break;
+ case OPT_static_libgfortran:
+#ifndef HAVE_LD_STATIC_DYNAMIC
+ gfc_fatal_error ("-static-libgfortran is not supported in this "
+ "configuration");
+#endif
+ break;
+
case OPT_fimplicit_none:
gfc_option.flag_implicit_none = value;
break;
+ case OPT_fintrinsic_modules_path:
+ gfc_add_include_path (arg, false);
+ gfc_add_intrinsic_modules_path (arg);
+ 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_fmodule_private:
- gfc_option.flag_module_access_private = value;
+ gfc_option.flag_module_private = value;
break;
-
- case OPT_fno_backend:
- gfc_option.flag_no_backend = value;
+
+ case OPT_frange_check:
+ gfc_option.flag_range_check = value;
break;
case OPT_fpack_derived:
@@ -538,12 +664,6 @@ gfc_handle_option (size_t scode, const char *arg, int value)
gfc_option.max_identifier_length = value;
break;
- case OPT_qkind_:
- if (gfc_validate_kind (BT_REAL, value, true) < 0)
- gfc_fatal_error ("Argument to -fqkind isn't a valid real kind");
- gfc_option.q_kind = value;
- break;
-
case OPT_fdefault_integer_8:
gfc_option.flag_default_integer = value;
break;
@@ -556,15 +676,67 @@ gfc_handle_option (size_t scode, const char *arg, int value)
gfc_option.flag_default_double = value;
break;
+ case OPT_finit_local_zero:
+ gfc_option.flag_init_integer = GFC_INIT_INTEGER_ON;
+ gfc_option.flag_init_integer_value = 0;
+ gfc_option.flag_init_real = GFC_INIT_REAL_ZERO;
+ gfc_option.flag_init_logical = GFC_INIT_LOGICAL_FALSE;
+ gfc_option.flag_init_character = GFC_INIT_CHARACTER_ON;
+ gfc_option.flag_init_character_value = (char)0;
+ break;
+
+ case OPT_finit_logical_:
+ if (!strcasecmp (arg, "false"))
+ gfc_option.flag_init_logical = GFC_INIT_LOGICAL_FALSE;
+ else if (!strcasecmp (arg, "true"))
+ gfc_option.flag_init_logical = GFC_INIT_LOGICAL_TRUE;
+ else
+ gfc_fatal_error ("Unrecognized option to -finit-logical: %s",
+ arg);
+ break;
+
+ case OPT_finit_real_:
+ if (!strcasecmp (arg, "zero"))
+ 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, "inf"))
+ gfc_option.flag_init_real = GFC_INIT_REAL_INF;
+ else if (!strcasecmp (arg, "-inf"))
+ gfc_option.flag_init_real = GFC_INIT_REAL_NEG_INF;
+ else
+ gfc_fatal_error ("Unrecognized option to -finit-real: %s",
+ arg);
+ break;
+
+ case OPT_finit_integer_:
+ gfc_option.flag_init_integer = GFC_INIT_INTEGER_ON;
+ gfc_option.flag_init_integer_value = atoi (arg);
+ break;
+
+ case OPT_finit_character_:
+ if (value >= 0 && value <= 127)
+ {
+ gfc_option.flag_init_character = GFC_INIT_CHARACTER_ON;
+ gfc_option.flag_init_character_value = (char)value;
+ }
+ else
+ gfc_fatal_error ("The value of n in -finit-character=n must be "
+ "between 0 and 127");
+ break;
+
case OPT_I:
- gfc_add_include_path (arg);
+ gfc_add_include_path (arg, true);
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;
@@ -572,6 +744,8 @@ gfc_handle_option (size_t scode, const char *arg, int value)
case OPT_std_f95:
gfc_option.allow_std = GFC_STD_F95_OBS | GFC_STD_F95 | GFC_STD_F77;
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;
@@ -583,20 +757,24 @@ gfc_handle_option (size_t scode, const char *arg, int value)
gfc_option.warn_std = GFC_STD_F95_OBS;
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_option.warn_std = GFC_STD_F95_OBS;
+ gfc_option.max_identifier_length = 63;
+ gfc_option.warn_ampersand = 1;
+ gfc_option.warn_tabs = 0;
break;
case OPT_std_gnu:
- gfc_option.allow_std = GFC_STD_F95_OBS | GFC_STD_F95_DEL
- | GFC_STD_F77 | GFC_STD_F95 | GFC_STD_F2003
- | GFC_STD_GNU | GFC_STD_LEGACY;
- gfc_option.warn_std = GFC_STD_F95_OBS | GFC_STD_F95_DEL
- | GFC_STD_LEGACY;
+ set_default_std_flags ();
break;
case OPT_std_legacy:
- gfc_option.allow_std = GFC_STD_F95_OBS | GFC_STD_F95_DEL
- | GFC_STD_F77 | GFC_STD_F95 | GFC_STD_F2003
- | GFC_STD_GNU | GFC_STD_LEGACY;
+ set_default_std_flags ();
gfc_option.warn_std = 0;
break;
@@ -609,19 +787,19 @@ gfc_handle_option (size_t scode, const char *arg, int value)
break;
case OPT_fconvert_little_endian:
- gfc_option.convert = CONVERT_LITTLE;
+ gfc_option.convert = GFC_CONVERT_LITTLE;
break;
case OPT_fconvert_big_endian:
- gfc_option.convert = CONVERT_BIG;
+ gfc_option.convert = GFC_CONVERT_BIG;
break;
case OPT_fconvert_native:
- gfc_option.convert = CONVERT_NATIVE;
+ gfc_option.convert = GFC_CONVERT_NATIVE;
break;
case OPT_fconvert_swap:
- gfc_option.convert = CONVERT_SWAP;
+ gfc_option.convert = GFC_CONVERT_SWAP;
break;
case OPT_frecord_marker_4:
@@ -631,6 +809,18 @@ gfc_handle_option (size_t scode, const char *arg, int value)
case OPT_frecord_marker_8:
gfc_option.record_marker = 8;
break;
+
+ case OPT_fmax_subrecord_length_:
+ if (value > MAX_SUBRECORD_LENGTH)
+ gfc_fatal_error ("Maximum subrecord length cannot exceed %d",
+ MAX_SUBRECORD_LENGTH);
+
+ gfc_option.max_subrecord_length = value;
+ break;
+
+ case OPT_frecursive:
+ gfc_option.flag_recursive = 1;
+ break;
}
return result;