From 28b23f698feb03d03e38b7c65ee5e65368741494 Mon Sep 17 00:00:00 2001 From: fxcoudert Date: Sun, 19 Nov 2006 21:18:26 +0000 Subject: * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118998 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/resolve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc/fortran/resolve.c') diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index a0e8838eef6..31e1d7c2426 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); -- cgit v1.2.3