From: Tobias Burnus <burnus@net-b.de>
Date: Sat, 24 Jan 2015 17:10:48 +0000 (+0100)
Subject: parse.c (gfc_parse_file): Fix two-location gfc_error call.
X-Git-Tag: releases/gcc-5.1.0~1397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d773ed85c56fbae24f13b4e4a054fcc7ca1550f7;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 26af04165987..be961012e4b2 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 fd7d4ebc39fa..34e30263836b 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;