aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2013-04-16 16:17:15 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2013-04-16 16:17:15 +0200
commit326785a3e529f6a5b6d7d46c8e7ebfeb94ee12df (patch)
tree0efe60282a26456304b0d261fc5a709269d9bac1 /gcc/fortran
parenteb7062cf8413f9cca68e2befff6ca7559988a688 (diff)
downloadgcc-326785a3e529f6a5b6d7d46c8e7ebfeb94ee12df.zip
gcc-326785a3e529f6a5b6d7d46c8e7ebfeb94ee12df.tar.gz
gcc-326785a3e529f6a5b6d7d46c8e7ebfeb94ee12df.tar.bz2
re PR fortran/56969 (ISO_C_BINDING regression with current trunk)
2013-04-16 Tobias Burnus <burnus@net-b.de> PR fortran/56969 * intrinsic.c (gfc_intrinsic_func_interface): Don't set module name to "(intrinsic)" for intrinsics from intrinsic modules. 2013-04-16 Tobias Burnus <burnus@net-b.de> PR fortran/56969 * gfortran.dg/c_assoc_5.f90: New. From-SVN: r198000
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog7
-rw-r--r--gcc/fortran/intrinsic.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8baf108..34719a1 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-16 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/56969
+ * intrinsic.c (gfc_intrinsic_func_interface): Don't set
+ module name to "(intrinsic)" for intrinsics from intrinsic
+ modules.
+
2013-04-15 Tobias Burnus <burnus@net-b.de>
* intrinsic.texi (SYSTEM_CLOCK): Recommend kind=8.
diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c
index c431279..688332f 100644
--- a/gcc/fortran/intrinsic.c
+++ b/gcc/fortran/intrinsic.c
@@ -4236,7 +4236,8 @@ gfc_intrinsic_func_interface (gfc_expr *expr, int error_flag)
got_specific:
expr->value.function.isym = specific;
- gfc_intrinsic_symbol (expr->symtree->n.sym);
+ if (!expr->symtree->n.sym->module)
+ gfc_intrinsic_symbol (expr->symtree->n.sym);
if (!error_flag)
gfc_pop_suppress_errors ();