diff options
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/symbol.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e9043dd..3d0b88c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2017-07-03 Dominique d'Humieres <dominiq@lps.ens.fr> + + PR fortran/79843 + * symbol.c (check_conflict): Add missing "conflicts". + 2017-06-29 Cesar Philippidis <cesar@codesourcery.com> PR fortran/77765 diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index ec43e63..3bc2b34 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -845,13 +845,13 @@ conflict: conflict_std: if (name == NULL) { - return gfc_notify_std (standard, "%s attribute " + return gfc_notify_std (standard, "%s attribute conflicts " "with %s attribute at %L", a1, a2, where); } else { - return gfc_notify_std (standard, "%s attribute " + return gfc_notify_std (standard, "%s attribute conflicts " "with %s attribute in %qs at %L", a1, a2, name, where); } |