aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2015-01-24 18:10:48 +0100
committerTobias Burnus <burnus@gcc.gnu.org>2015-01-24 18:10:48 +0100
commitd773ed85c56fbae24f13b4e4a054fcc7ca1550f7 (patch)
tree6a6da94d0d1c2e7f175209f8d27e1859544e9662 /gcc
parent8790f572ea92bd4621941da251b98856c0f58901 (diff)
downloadgcc-d773ed85c56fbae24f13b4e4a054fcc7ca1550f7.zip
gcc-d773ed85c56fbae24f13b4e4a054fcc7ca1550f7.tar.gz
gcc-d773ed85c56fbae24f13b4e4a054fcc7ca1550f7.tar.bz2
parse.c (gfc_parse_file): Fix two-location gfc_error call.
2015-01-24 Tobias Burnus <burnus@net-b.de> * parse.c (gfc_parse_file): Fix two-location gfc_error call. From-SVN: r220084
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog4
-rw-r--r--gcc/fortran/parse.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 26af041..be96101 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-24 Tobias Burnus <burnus@net-b.de>
+
+ * parse.c (gfc_parse_file): Fix two-location gfc_error call.
+
2015-01-23 Martin Liska <mliska@suse.cz>
* decl.c (attr_decl1): Workaround -Wmaybe-uninitialized
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index fd7d4eb..34e3026 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -5544,7 +5544,7 @@ duplicate_main:
/* If we see a duplicate main program, shut down. If the second
instance is an implied main program, i.e. data decls or executable
statements, we're in for lots of errors. */
- gfc_error ("Two main PROGRAMs at %L and %C", &prog_locus);
+ gfc_error_1 ("Two main PROGRAMs at %L and %C", &prog_locus);
reject_statement ();
gfc_done_2 ();
return true;