diff options
| author | Francois-Xavier Coudert <coudert@clipper.ens.fr> | 2006-11-19 22:18:26 +0100 |
|---|---|---|
| committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2006-11-19 21:18:26 +0000 |
| commit | 39f87c0333117fa64894cb1f7dd0e69307a9cf0d (patch) | |
| tree | b2734b99a31fb23609fb1cb9fad4c26a5baeb8b2 /gcc/fortran/resolve.c | |
| parent | 0eab7815089fe868b55e502c69d61d97346535af (diff) | |
| download | gcc-39f87c0333117fa64894cb1f7dd0e69307a9cf0d.zip gcc-39f87c0333117fa64894cb1f7dd0e69307a9cf0d.tar.gz gcc-39f87c0333117fa64894cb1f7dd0e69307a9cf0d.tar.bz2 | |
module.c (gfc_use_module): Uncomment the ISO_FORTRAN_ENV code.
* module.c (gfc_use_module): Uncomment the ISO_FORTRAN_ENV code.
Check that intrinsic and non-intrinsic modules don't conflict.
(use_iso_fortran_env_module): New function.
(create_int_parameter): New function.
* trans-types.c (gfc_init_kinds): Choose values for
gfc_numeric_storage_size and gfc_character_storage_size.
(gfc_numeric_storage_size, gfc_character_storage_size): New variables.
* resolve.c (resolve_symbol): Do no check intrinsic modules
against the list of intrinsic symbols.
* iso-fortran-env.def: New file.
* gfortran.h (gfc_numeric_storage_size,
gfc_character_storage_size): Add prototypes.
* gfortran.dg/use_3.f90: Remove error message.
* gfortran.dg/iso_fortran_env_1.f90: New test.
* gfortran.dg/iso_fortran_env_2.f90: New test.
* gfortran.dg/iso_fortran_env_3.f90: New test.
* gfortran.dg/iso_fortran_env_4.f90: New test.
From-SVN: r118998
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index a0e8838..31e1d7c 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -6007,7 +6007,7 @@ resolve_symbol (gfc_symbol * sym) } /* Make sure that intrinsic exist */ - if (sym->attr.intrinsic + if (sym->attr.flavor != FL_MODULE && sym->attr.intrinsic && ! gfc_intrinsic_name(sym->name, 0) && ! gfc_intrinsic_name(sym->name, 1)) gfc_error("Intrinsic at %L does not exist", &sym->declared_at); |