diff options
| author | Tobias Burnus <burnus@net-b.de> | 2014-12-16 21:44:45 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-12-16 21:44:45 +0100 |
| commit | c61819ff0f851ca343362f742f819bb459880eb6 (patch) | |
| tree | d102a0fa85741b2b8e259078e943f9ba1f72a927 /gcc/fortran/array.c | |
| parent | 931977d9191b542c356d2dfa3258c8d09a6b8498 (diff) | |
| download | gcc-c61819ff0f851ca343362f742f819bb459880eb6.zip gcc-c61819ff0f851ca343362f742f819bb459880eb6.tar.gz gcc-c61819ff0f851ca343362f742f819bb459880eb6.tar.bz2 | |
re PR fortran/54687 (Use gcc option machinery for gfortran)
2014-12-16 Tobias Burnus <burnus@net-b.de>
PR fortran/54687
* gfortran.h (gfc_option_t): Remove flags which now
have a Var().
* lang.opt (flag-aggressive_function_elimination,
flag-align_commons, flag-all_intrinsics,
flag-allow_leading_underscore, flag-automatic, flag-backslash,
flag-backtrace, flag-blas_matmul_limit, flag-cray_pointer,
flag-dollar_ok, flag-dump_fortran_original,
flag-dump_fortran_optimized, flag-external_blas, flag-f2c,
flag-implicit_none, flag-max_array_constructor,
flag-module_private, flag-pack_derived, flag-range_check,
flag-recursive, flag-repack_arrays, flag-sign_zero,
flag-underscoring): Add Var() and, where applicable, Enum().
* options.c (gfc_init_options, gfc_post_options,
gfc_handle_option): Update for *.opt changes.
* arith.c: Update for flag-variable name changes.
* array.c: Ditto.
* cpp.c: Ditto.
* decl.c: Ditto.
* expr.c: Ditto.
* f95-lang.c: Ditto.
* frontend-passes.c: Ditto.
* intrinsic.c: Ditto.
* io.c: Ditto.
* match.c: Ditto.
* module.c: Ditto.
* parse.c: Ditto.
* primary.c: Ditto.
* resolve.c: Ditto.
* scanner.c: Ditto.
* simplify.c: Ditto.
* symbol.c: Ditto.
* trans-array.c: Ditto.
* trans-common.c: Ditto.
* trans-decl.c: Ditto.
* trans-expr.c: Ditto.
* trans-intrinsic.c: Ditto.
* trans-openmp.c: Ditto.
* trans-types.c: Ditto.
From-SVN: r218792
Diffstat (limited to 'gcc/fortran/array.c')
| -rw-r--r-- | gcc/fortran/array.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index 300bfeb..e88ba66 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "flags.h" #include "gfortran.h" #include "match.h" #include "constructor.h" @@ -1654,7 +1655,7 @@ gfc_expand_constructor (gfc_expr *e, bool fatal) /* If we can successfully get an array element at the max array size then the array is too big to expand, so we just return. */ - f = gfc_get_array_element (e, gfc_option.flag_max_array_constructor); + f = gfc_get_array_element (e, flag_max_array_constructor); if (f != NULL) { gfc_free_expr (f); @@ -1663,8 +1664,7 @@ gfc_expand_constructor (gfc_expr *e, bool fatal) gfc_error ("The number of elements in the array constructor " "at %L requires an increase of the allowed %d " "upper limit. See %<-fmax-array-constructor%> " - "option", &e->where, - gfc_option.flag_max_array_constructor); + "option", &e->where, flag_max_array_constructor); return false; } return true; |